Mercurial > python-cmd2

annotate cmd2.py @ 203:68a609fc516b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
limit < infile slurp to cases where infile found
author catherine@dellzilla
date Mon, 02 Mar 2009 14:53:27 -0500
parents da8c265934ee
children 5d22be6d2f88
rev   line source
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
1 """Variant on standard library's cmd with extra features.
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
2
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
3 To use, simply import cmd2.Cmd instead of cmd.Cmd; use precisely as though you
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
4 were using the standard library's cmd, while enjoying the extra features.
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
5
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
6 Searchable command history (commands: "hi", "li", "run")
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
7 Load commands from file, save to file, edit commands in file
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
8 Multi-line commands
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
9 Case-insensitive commands
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
10 Special-character shortcut commands (beyond cmd's "@" and "!")
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
11 Settable environment parameters
13
c6e8b645c0ab tweaking docs
catherine@localhost
parents: 12
diff changeset
12 Parsing commands with `optparse` options (flags)
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
13 Redirection to file with >, >>; input from file with <
112
e3b8eaadea56 going to collapse down out of overdone package structure
catherine@Elli.myhome.westell.com
parents: 109
diff changeset
14 Easy transcript-based testing of applications (see example/example.py)
13
c6e8b645c0ab tweaking docs
catherine@localhost
parents: 12
diff changeset
15
84
416ea36af789 fixed bug in setting parameters
catherine@Elli.myhome.westell.com
parents: 83
diff changeset
16 Note that redirection with > and | will only work if `self.stdout.write()`
416ea36af789 fixed bug in setting parameters
catherine@Elli.myhome.westell.com
parents: 83
diff changeset
17 is used in place of `print`. The standard library's `cmd` module is
416ea36af789 fixed bug in setting parameters
catherine@Elli.myhome.westell.com
parents: 83
diff changeset
18 written to use `self.stdout.write()`,
416ea36af789 fixed bug in setting parameters
catherine@Elli.myhome.westell.com
parents: 83
diff changeset
19
14
a242603905d9 ready to release 0.3.0
catherine@localhost
parents: 13
diff changeset
20 - Catherine Devlin, Jan 03 2008 - catherinedevlin.blogspot.com
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
21
126
197a312f2656 push to get to v 126
catherine@dellzilla
parents: 124
diff changeset
22 mercurial repository at http://www.assembla.com/wiki/show/python-cmd2
14
a242603905d9 ready to release 0.3.0
catherine@localhost
parents: 13
diff changeset
23 CHANGES:
a242603905d9 ready to release 0.3.0
catherine@localhost
parents: 13
diff changeset
24 As of 0.3.0, options should be specified as `optparse` options. See README.txt.
a242603905d9 ready to release 0.3.0
catherine@localhost
parents: 13
diff changeset
25 flagReader.py options are still supported for backward compatibility
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
26 """
192
c0d4c7ba14a9 added settable timings param
catherine@Elli.myhome.westell.com
parents: 191
diff changeset
27 import cmd, re, os, sys, optparse, subprocess, tempfile, pyparsing, doctest
c0d4c7ba14a9 added settable timings param
catherine@Elli.myhome.westell.com
parents: 191
diff changeset
28 import unittest, string, datetime
10
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
29 from optparse import make_option
197
770c77152051 clean out debugging comment
catherine@dellzilla
parents: 195
diff changeset
30 __version__ = '0.4.6'
10
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
31
11
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
32 class OptionParser(optparse.OptionParser):
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
33 def exit(self, status=0, msg=None):
38
6d715d7a04fd proper exit after -h, -v
catherine@localhost
parents: 37
diff changeset
34 self.values._exit = True
11
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
35 if msg:
15
0eb8d4e18472 fixed error handling
catherine@localhost
parents: 14
diff changeset
36 print msg
11
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
37
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
38 def error(self, msg):
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
39 """error(msg : string)
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
40
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
41 Print a usage message incorporating 'msg' to stderr and exit.
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
42 If you override this in a subclass, it should not return -- it
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
43 should either exit or raise an exception.
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
44 """
15
0eb8d4e18472 fixed error handling
catherine@localhost
parents: 14
diff changeset
45 raise
11
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
46
187
183dd2fffec5 newline terminators ok
catherine@Elli.myhome.westell.com
parents: 186
diff changeset
47 def remainingArgs(oldArgs, newArgList):
183dd2fffec5 newline terminators ok
catherine@Elli.myhome.westell.com
parents: 186
diff changeset
48 '''
183dd2fffec5 newline terminators ok
catherine@Elli.myhome.westell.com
parents: 186
diff changeset
49 >>> remainingArgs('-f bar bar cow', ['bar', 'cow'])
183dd2fffec5 newline terminators ok
catherine@Elli.myhome.westell.com
parents: 186
diff changeset
50 'bar cow'
183dd2fffec5 newline terminators ok
catherine@Elli.myhome.westell.com
parents: 186
diff changeset
51 '''
189
catherine@Elli.myhome.westell.com
parents: 187
diff changeset
52 pattern = '\s+'.join(re.escape(a) for a in newArgList) + '\s*$'
187
183dd2fffec5 newline terminators ok
catherine@Elli.myhome.westell.com
parents: 186
diff changeset
53 matchObj = re.search(pattern, oldArgs)
183dd2fffec5 newline terminators ok
catherine@Elli.myhome.westell.com
parents: 186
diff changeset
54 return oldArgs[matchObj.start():]
183dd2fffec5 newline terminators ok
catherine@Elli.myhome.westell.com
parents: 186
diff changeset
55
10
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
56 def options(option_list):
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
57 def option_setup(func):
11
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
58 optionParser = OptionParser()
10
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
59 for opt in option_list:
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
60 optionParser.add_option(opt)
12
catherine@localhost
parents: 11
diff changeset
61 optionParser.set_usage("%s [options] arg" % func.__name__.strip('do_'))
10
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
62 def newFunc(instance, arg):
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
63 try:
190
catherine@Elli.myhome.westell.com
parents: 189
diff changeset
64 opts, newArgList = optionParser.parse_args(arg.split()) # doesn't understand quoted strings shouldn't be dissected!
catherine@Elli.myhome.westell.com
parents: 189
diff changeset
65 newArgs = remainingArgs(arg, newArgList) # should it permit flags after args?
20
c8efa4369189 fixes to option parsing
catherine@cordelia
parents: 15
diff changeset
66 except (optparse.OptionValueError, optparse.BadOptionError,
c8efa4369189 fixes to option parsing
catherine@cordelia
parents: 15
diff changeset
67 optparse.OptionError, optparse.AmbiguousOptionError,
c8efa4369189 fixes to option parsing
catherine@cordelia
parents: 15
diff changeset
68 optparse.OptionConflictError), e:
10
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
69 print e
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
70 optionParser.print_help()
38
6d715d7a04fd proper exit after -h, -v
catherine@localhost
parents: 37
diff changeset
71 return
6d715d7a04fd proper exit after -h, -v
catherine@localhost
parents: 37
diff changeset
72 if hasattr(opts, '_exit'):
6d715d7a04fd proper exit after -h, -v
catherine@localhost
parents: 37
diff changeset
73 return None
187
183dd2fffec5 newline terminators ok
catherine@Elli.myhome.westell.com
parents: 186
diff changeset
74 terminator = arg.parsed.terminator
183dd2fffec5 newline terminators ok
catherine@Elli.myhome.westell.com
parents: 186
diff changeset
75 try:
183dd2fffec5 newline terminators ok
catherine@Elli.myhome.westell.com
parents: 186
diff changeset
76 if arg.parsed.terminator[0] == '\n':
183dd2fffec5 newline terminators ok
catherine@Elli.myhome.westell.com
parents: 186
diff changeset
77 terminator = arg.parsed.terminator[0]
183dd2fffec5 newline terminators ok
catherine@Elli.myhome.westell.com
parents: 186
diff changeset
78 except IndexError:
183dd2fffec5 newline terminators ok
catherine@Elli.myhome.westell.com
parents: 186
diff changeset
79 pass
183dd2fffec5 newline terminators ok
catherine@Elli.myhome.westell.com
parents: 186
diff changeset
80 arg = arg.parser('%s %s%s%s' % (arg.parsed.command, newArgs, terminator, arg.parsed.suffix))
37
a974e2f44cbe made redirectors work with app-specific StatementEndPattern
catherine@localhost
parents: 36
diff changeset
81 result = func(instance, arg, opts)
159
5a94501b6b93 fix new bug in argument parsing
catherine@dellzilla
parents: 158
diff changeset
82 return result
10
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
83 newFunc.__doc__ = '%s\n%s' % (func.__doc__, optionParser.format_help())
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
84 return newFunc
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
85 return option_setup
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
86
27
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
87 class PasteBufferError(EnvironmentError):
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
88 if sys.platform[:3] == 'win':
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
89 errmsg = """Redirecting to or from paste buffer requires pywin32
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
90 to be installed on operating system.
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
91 Download from http://sourceforge.net/projects/pywin32/"""
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
92 else:
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
93 errmsg = """Redirecting to or from paste buffer requires xclip
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
94 to be installed on operating system.
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
95 On Debian/Ubuntu, 'sudo apt-get install xclip' will install it."""
28
28b3fb301d3d almost working, but problem with check_call
catherine@cordelia
parents: 27
diff changeset
96 def __init__(self):
27
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
97 Exception.__init__(self, self.errmsg)
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
98
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
99 '''check here if functions exist; otherwise, stub out'''
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
100 pastebufferr = """Redirecting to or from paste buffer requires %s
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
101 to be installed on operating system.
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
102 %s"""
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
103 if subprocess.mswindows:
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
104 try:
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
105 import win32clipboard
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
106 def getPasteBuffer():
28
28b3fb301d3d almost working, but problem with check_call
catherine@cordelia
parents: 27
diff changeset
107 win32clipboard.OpenClipboard(0)
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
108 try:
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
109 result = win32clipboard.GetClipboardData()
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
110 except TypeError:
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
111 result = '' #non-text
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
112 win32clipboard.CloseClipboard()
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
113 return result
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
114 def writeToPasteBuffer(txt):
28
28b3fb301d3d almost working, but problem with check_call
catherine@cordelia
parents: 27
diff changeset
115 win32clipboard.OpenClipboard(0)
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
116 win32clipboard.EmptyClipboard()
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
117 win32clipboard.SetClipboardText(txt)
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
118 win32clipboard.CloseClipboard()
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
119 except ImportError:
106
2d3232693807 prompt-setting quirks
catherine@dellzilla
parents: 105
diff changeset
120 def getPasteBuffer(*args):
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
121 raise OSError, pastebufferr % ('pywin32', 'Download from http://sourceforge.net/projects/pywin32/')
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
122 setPasteBuffer = getPasteBuffer
27
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
123 else:
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
124 can_clip = False
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
125 try:
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
126 subprocess.check_call('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
127 can_clip = True
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
128 except AttributeError: # check_call not defined, Python < 2.5
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
129 teststring = 'Testing for presence of xclip.'
31
dd64c0e3dbe0 fixed err in python 2.4 xclip detection
catherine@localhost
parents: 29
diff changeset
130 xclipproc = subprocess.Popen('xclip -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
131 xclipproc.stdin.write(teststring)
31
dd64c0e3dbe0 fixed err in python 2.4 xclip detection
catherine@localhost
parents: 29
diff changeset
132 xclipproc.stdin.close()
dd64c0e3dbe0 fixed err in python 2.4 xclip detection
catherine@localhost
parents: 29
diff changeset
133 xclipproc = subprocess.Popen('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
134 if xclipproc.stdout.read() == teststring:
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
135 can_clip = True
56
f844b6c78192 fixing (hopefully) broken pipe error for headless systems
catherine.devlin@gmail.com
parents: 54
diff changeset
136 except (subprocess.CalledProcessError, OSError, IOError):
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
137 pass
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
138 if can_clip:
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
139 def getPasteBuffer():
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
140 xclipproc = subprocess.Popen('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
141 return xclipproc.stdout.read()
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
142 def writeToPasteBuffer(txt):
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
143 xclipproc = subprocess.Popen('xclip -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
144 xclipproc.stdin.write(txt)
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
145 xclipproc.stdin.close()
83
2176ce847939 merged copy to both clipboards in
catherine@Elli.myhome.westell.com
parents: 82
diff changeset
146 # but we want it in both the "primary" and "mouse" clipboards
2176ce847939 merged copy to both clipboards in
catherine@Elli.myhome.westell.com
parents: 82
diff changeset
147 xclipproc = subprocess.Popen('xclip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
2176ce847939 merged copy to both clipboards in
catherine@Elli.myhome.westell.com
parents: 82
diff changeset
148 xclipproc.stdin.write(txt)
2176ce847939 merged copy to both clipboards in
catherine@Elli.myhome.westell.com
parents: 82
diff changeset
149 xclipproc.stdin.close()
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
150 else:
106
2d3232693807 prompt-setting quirks
catherine@dellzilla
parents: 105
diff changeset
151 def getPasteBuffer(*args):
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
152 raise OSError, pastebufferr % ('xclip', 'On Debian/Ubuntu, install with "sudo apt-get install xclip"')
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
153 setPasteBuffer = getPasteBuffer
106
2d3232693807 prompt-setting quirks
catherine@dellzilla
parents: 105
diff changeset
154 writeToPasteBuffer = getPasteBuffer
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
155
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
156 pyparsing.ParserElement.setDefaultWhitespaceChars(' \t')
154
606ad25c7f7e new experiment with ignore?
catherine@dellzilla
parents: 153
diff changeset
157
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
158 class ParsedString(str):
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
159 pass
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
160
203
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
161 class SkipToLast(pyparsing.SkipTo):
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
162 def parseImpl( self, instring, loc, doActions=True ):
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
163 resultStore = []
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
164 startLoc = loc
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
165 instrlen = len(instring)
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
166 expr = self.expr
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
167 failParse = False
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
168 while loc <= instrlen:
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
169 try:
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
170 if self.failOn:
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
171 failParse = True
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
172 self.failOn.tryParse(instring, loc)
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
173 failParse = False
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
174 loc = expr._skipIgnorables( instring, loc )
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
175 expr._parse( instring, loc, doActions=False, callPreParse=False )
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
176 skipText = instring[startLoc:loc]
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
177 if self.includeMatch:
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
178 loc,mat = expr._parse(instring,loc,doActions,callPreParse=False)
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
179 if mat:
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
180 skipRes = ParseResults( skipText )
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
181 skipRes += mat
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
182 resultStore.append((loc, [ skipRes ]))
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
183 else:
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
184 resultStore,append((loc, [ skipText ]))
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
185 else:
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
186 resultStore.append((loc, [ skipText ]))
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
187 loc += 1
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
188 except (pyparsing.ParseException,IndexError):
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
189 if failParse:
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
190 raise
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
191 else:
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
192 loc += 1
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
193 if resultStore:
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
194 return resultStore[-1]
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
195 else:
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
196 exc = self.myException
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
197 exc.loc = loc
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
198 exc.pstr = instring
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
199 raise exc
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
200
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
201 def replace_with_file_contents(fname):
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
202 if fname:
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
203 try:
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
204 result = open(os.path.expanduser(fname[0])).read()
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
205 except IOError:
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
206 result = '< %s' % fname[0] # wasn't a file after all
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
207 else:
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
208 result = getPasteBuffer()
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
209 return result
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
210
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
211 class Cmd(cmd.Cmd):
103
e4daf715fc31 echo on
catherine@dellzilla
parents: 100
diff changeset
212 echo = False
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
213 caseInsensitive = True
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
214 continuationPrompt = '> '
192
c0d4c7ba14a9 added settable timings param
catherine@Elli.myhome.westell.com
parents: 191
diff changeset
215 timing = False
166
a3414ac38677 so close - now problem with terminator in string
catherine@dellzilla
parents: 165
diff changeset
216 legalChars = '!#$%.:?@_' + pyparsing.alphanums + pyparsing.alphas8bit # make sure your terminators are not in here!
137
308e99cebbb8 comments working?
catherine@dellzilla
parents: 136
diff changeset
217 shortcuts = {'?': 'help', '!': 'shell', '@': 'load' }
106
2d3232693807 prompt-setting quirks
catherine@dellzilla
parents: 105
diff changeset
218 excludeFromHistory = '''run r list l history hi ed edit li eof'''.split()
2d3232693807 prompt-setting quirks
catherine@dellzilla
parents: 105
diff changeset
219 noSpecialParse = 'set ed edit exit'.split()
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
220 defaultExtension = 'txt'
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
221 defaultFileName = 'command.txt'
203
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
222 settable = ['prompt', 'continuationPrompt', 'defaultFileName', 'editor', 'caseInsensitive',
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
223 'echo', 'timing']
199
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
224 settable.sort()
169
429c8e984df4 all working, except \n\n terminators
catherine@dellzilla
parents: 168
diff changeset
225
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
226 editor = os.environ.get('EDITOR')
42
b3200c6e5763 inserting exception for quit...
catherine@cordelia
parents: 41
diff changeset
227 _STOP_AND_EXIT = 2
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
228 if not editor:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
229 if sys.platform[:3] == 'win':
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
230 editor = 'notepad'
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
231 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
232 for editor in ['gedit', 'kate', 'vim', 'emacs', 'nano', 'pico']:
47
927bc07467de fixed misfind of editor
catherine@cordelia
parents: 46
diff changeset
233 if not os.system('which %s' % (editor)):
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
234 break
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
235
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
236 def do_cmdenvironment(self, args):
193
e96877b59371 tweaked docs
catherine@Elli.myhome.westell.com
parents: 192
diff changeset
237 '''Summary report of interactive parameters.'''
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
238 self.stdout.write("""
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
239 Commands are %(casesensitive)scase-sensitive.
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
240 Commands may be terminated with: %(terminators)s
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
241 Settable parameters: %(settable)s
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
242 """ %
193
e96877b59371 tweaked docs
catherine@Elli.myhome.westell.com
parents: 192
diff changeset
243 { 'casesensitive': (self.caseInsensitive and 'not ') or '',
171
0b93f1a4076c lstripping commands
catherine@dellzilla
parents: 170
diff changeset
244 'terminators': str(self.terminators),
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
245 'settable': ' '.join(self.settable)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
246 })
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
247
10
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
248 def do_help(self, arg):
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
249 cmd.Cmd.do_help(self, arg)
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
250 try:
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
251 fn = getattr(self, 'do_' + arg)
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
252 if fn and fn.optionParser:
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
253 fn.optionParser.print_help(file=self.stdout)
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
254 except AttributeError:
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
255 pass
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
256
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
257 def __init__(self, *args, **kwargs):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
258 cmd.Cmd.__init__(self, *args, **kwargs)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
259 self.history = History()
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
260 self._init_parser()
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
261
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
262 def do_shortcuts(self, args):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
263 """Lists single-key shortcuts available."""
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
264 result = "\n".join('%s: %s' % (sc[0], sc[1]) for sc in self.shortcuts.items())
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
265 self.stdout.write("Single-key shortcuts for other commands:\n%s\n" % (result))
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
266
137
308e99cebbb8 comments working?
catherine@dellzilla
parents: 136
diff changeset
267 commentGrammars = pyparsing.Or([pyparsing.pythonStyleComment, pyparsing.cStyleComment])
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
268 commentGrammars.addParseAction(lambda x: '')
136
67558b85ab38 comments working?
catherine@dellzilla
parents: 135
diff changeset
269 commentInProgress = pyparsing.Literal('/*') + pyparsing.SkipTo(pyparsing.stringEnd)
171
0b93f1a4076c lstripping commands
catherine@dellzilla
parents: 170
diff changeset
270 terminators = [';']
0b93f1a4076c lstripping commands
catherine@dellzilla
parents: 170
diff changeset
271 blankLinesAllowed = False
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
272 multilineCommands = []
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
273
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
274 def _init_parser(self):
184
d1a87c14675b putting parsing variables under self
catherine@Elli.myhome.westell.com
parents: 183
diff changeset
275 r'''
146
9ffb01d8876f streamlining parsing
catherine@dellzilla
parents: 145
diff changeset
276 >>> c = Cmd()
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
277 >>> c.multilineCommands = ['multiline']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
278 >>> c.caseInsensitive = True
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
279 >>> c._init_parser()
158
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
280 >>> print c.parser.parseString('').dump()
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
281 []
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
282 >>> print c.parser.parseString('/* empty command */').dump()
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
283 []
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
284 >>> print c.parser.parseString('plainword').dump()
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
285 ['plainword', '']
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
286 - command: plainword
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
287 - statement: ['plainword', '']
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
288 - command: plainword
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
289 >>> print c.parser.parseString('termbare;').dump()
158
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
290 ['termbare', '', ';', '']
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
291 - command: termbare
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
292 - statement: ['termbare', '', ';']
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
293 - command: termbare
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
294 - terminator: ;
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
295 - terminator: ;
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
296 >>> print c.parser.parseString('termbare; suffx').dump()
158
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
297 ['termbare', '', ';', 'suffx']
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
298 - command: termbare
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
299 - statement: ['termbare', '', ';']
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
300 - command: termbare
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
301 - terminator: ;
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
302 - suffix: suffx
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
303 - terminator: ;
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
304 >>> print c.parser.parseString('barecommand').dump()
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
305 ['barecommand', '']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
306 - command: barecommand
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
307 - statement: ['barecommand', '']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
308 - command: barecommand
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
309 >>> print c.parser.parseString('COMmand with args').dump()
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
310 ['command', 'with args']
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
311 - args: with args
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
312 - command: command
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
313 - statement: ['command', 'with args']
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
314 - args: with args
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
315 - command: command
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
316 >>> print c.parser.parseString('command with args and terminator; and suffix').dump()
158
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
317 ['command', 'with args and terminator', ';', 'and suffix']
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
318 - args: with args and terminator
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
319 - command: command
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
320 - statement: ['command', 'with args and terminator', ';']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
321 - args: with args and terminator
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
322 - command: command
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
323 - terminator: ;
158
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
324 - suffix: and suffix
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
325 - terminator: ;
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
326 >>> print c.parser.parseString('simple | piped').dump()
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
327 ['simple', '', '|', ' piped']
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
328 - command: simple
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
329 - pipeTo: piped
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
330 - statement: ['simple', '']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
331 - command: simple
199
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
332 >>> print c.parser.parseString('double-pipe || is not a pipe').dump()
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
333 ['double', '-pipe || is not a pipe']
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
334 - args: -pipe || is not a pipe
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
335 - command: double
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
336 - statement: ['double', '-pipe || is not a pipe']
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
337 - args: -pipe || is not a pipe
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
338 - command: double
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
339 >>> print c.parser.parseString('command with args, terminator;sufx | piped').dump()
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
340 ['command', 'with args, terminator', ';', 'sufx', '|', ' piped']
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
341 - args: with args, terminator
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
342 - command: command
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
343 - pipeTo: piped
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
344 - statement: ['command', 'with args, terminator', ';']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
345 - args: with args, terminator
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
346 - command: command
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
347 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
348 - suffix: sufx
155
8ba5127167f5 file output working again
catherine@dellzilla
parents: 154
diff changeset
349 - terminator: ;
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
350 >>> print c.parser.parseString('output into > afile.txt').dump()
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
351 ['output', 'into', '>', 'afile.txt']
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
352 - args: into
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
353 - command: output
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
354 - output: >
155
8ba5127167f5 file output working again
catherine@dellzilla
parents: 154
diff changeset
355 - outputTo: afile.txt
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
356 - statement: ['output', 'into']
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
357 - args: into
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
358 - command: output
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
359 >>> print c.parser.parseString('output into;sufx | pipethrume plz > afile.txt').dump()
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
360 ['output', 'into', ';', 'sufx', '|', ' pipethrume plz', '>', 'afile.txt']
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
361 - args: into
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
362 - command: output
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
363 - output: >
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
364 - outputTo: afile.txt
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
365 - pipeTo: pipethrume plz
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
366 - statement: ['output', 'into', ';']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
367 - args: into
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
368 - command: output
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
369 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
370 - suffix: sufx
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
371 - terminator: ;
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
372 >>> print c.parser.parseString('output to paste buffer >> ').dump()
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
373 ['output', 'to paste buffer', '>>', '']
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
374 - args: to paste buffer
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
375 - command: output
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
376 - output: >>
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
377 - statement: ['output', 'to paste buffer']
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
378 - args: to paste buffer
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
379 - command: output
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
380 >>> print c.parser.parseString('ignore the /* commented | > */ stuff;').dump()
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
381 ['ignore', 'the /* commented | > */ stuff', ';', '']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
382 - args: the /* commented | > */ stuff
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
383 - command: ignore
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
384 - statement: ['ignore', 'the /* commented | > */ stuff', ';']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
385 - args: the /* commented | > */ stuff
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
386 - command: ignore
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
387 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
388 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
389 >>> print c.parser.parseString('has > inside;').dump()
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
390 ['has', '> inside', ';', '']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
391 - args: > inside
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
392 - command: has
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
393 - statement: ['has', '> inside', ';']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
394 - args: > inside
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
395 - command: has
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
396 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
397 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
398 >>> print c.parser.parseString('multiline has > inside an unfinished command').dump()
173
10a45c030364 simplifying testcase
catherine@dellzilla
parents: 172
diff changeset
399 ['multiline', ' has > inside an unfinished command']
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
400 - multilineCommand: multiline
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
401 >>> print c.parser.parseString('multiline has > inside;').dump()
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
402 ['multiline', 'has > inside', ';', '']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
403 - args: has > inside
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
404 - multilineCommand: multiline
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
405 - statement: ['multiline', 'has > inside', ';']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
406 - args: has > inside
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
407 - multilineCommand: multiline
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
408 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
409 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
410 >>> print c.parser.parseString('multiline command /* with comment in progress;').dump()
173
10a45c030364 simplifying testcase
catherine@dellzilla
parents: 172
diff changeset
411 ['multiline', ' command /* with comment in progress;']
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
412 - multilineCommand: multiline
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
413 >>> print c.parser.parseString('multiline command /* with comment complete */ is done;').dump()
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
414 ['multiline', 'command /* with comment complete */ is done', ';', '']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
415 - args: command /* with comment complete */ is done
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
416 - multilineCommand: multiline
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
417 - statement: ['multiline', 'command /* with comment complete */ is done', ';']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
418 - args: command /* with comment complete */ is done
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
419 - multilineCommand: multiline
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
420 - terminator: ;
158
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
421 - terminator: ;
186
bee79220382c unit tests passing
catherine@Elli.myhome.westell.com
parents: 185
diff changeset
422 >>> print c.parser.parseString('multiline command ends\n\n').dump()
bee79220382c unit tests passing
catherine@Elli.myhome.westell.com
parents: 185
diff changeset
423 ['multiline', 'command ends', '\n', '\n']
bee79220382c unit tests passing
catherine@Elli.myhome.westell.com
parents: 185
diff changeset
424 - args: command ends
bee79220382c unit tests passing
catherine@Elli.myhome.westell.com
parents: 185
diff changeset
425 - multilineCommand: multiline
bee79220382c unit tests passing
catherine@Elli.myhome.westell.com
parents: 185
diff changeset
426 - statement: ['multiline', 'command ends', '\n', '\n']
bee79220382c unit tests passing
catherine@Elli.myhome.westell.com
parents: 185
diff changeset
427 - args: command ends
bee79220382c unit tests passing
catherine@Elli.myhome.westell.com
parents: 185
diff changeset
428 - multilineCommand: multiline
bee79220382c unit tests passing
catherine@Elli.myhome.westell.com
parents: 185
diff changeset
429 - terminator: ['\n', '\n']
bee79220382c unit tests passing
catherine@Elli.myhome.westell.com
parents: 185
diff changeset
430 - terminator: ['\n', '\n']
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
431 '''
195
455ebe415d5e do not interpret => as having the redirector >
catherine@dellzilla
parents: 194
diff changeset
432 outputParser = (pyparsing.Literal('>>') | (pyparsing.WordStart() + '>') | pyparsing.Regex('[^=]>'))('output')
455ebe415d5e do not interpret => as having the redirector >
catherine@dellzilla
parents: 194
diff changeset
433
171
0b93f1a4076c lstripping commands
catherine@dellzilla
parents: 170
diff changeset
434 terminatorParser = pyparsing.Or([(hasattr(t, 'parseString') and t) or pyparsing.Literal(t) for t in self.terminators])('terminator')
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
435 stringEnd = pyparsing.stringEnd ^ '\nEOF'
184
d1a87c14675b putting parsing variables under self
catherine@Elli.myhome.westell.com
parents: 183
diff changeset
436 self.multilineCommand = pyparsing.Or([pyparsing.Keyword(c, caseless=self.caseInsensitive) for c in self.multilineCommands])('multilineCommand')
186
bee79220382c unit tests passing
catherine@Elli.myhome.westell.com
parents: 185
diff changeset
437 oneLineCommand = (~self.multilineCommand + pyparsing.Word(self.legalChars))('command')
160
59b7847ec3ca little fixes
catherine@dellzilla
parents: 159
diff changeset
438 pipe = pyparsing.Keyword('|', identChars='|')
203
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
439 self.commentGrammars.ignore(pyparsing.quotedString).setParseAction(lambda x: '')
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
440 self.commentInProgress.ignore(pyparsing.quotedString).ignore(pyparsing.cStyleComment)
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
441 afterElements = \
160
59b7847ec3ca little fixes
catherine@dellzilla
parents: 159
diff changeset
442 pyparsing.Optional(pipe + pyparsing.SkipTo(outputParser ^ stringEnd)('pipeTo')) + \
155
8ba5127167f5 file output working again
catherine@dellzilla
parents: 154
diff changeset
443 pyparsing.Optional(outputParser + pyparsing.SkipTo(stringEnd).setParseAction(lambda x: x[0].strip())('outputTo'))
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
444 if self.caseInsensitive:
184
d1a87c14675b putting parsing variables under self
catherine@Elli.myhome.westell.com
parents: 183
diff changeset
445 self.multilineCommand.setParseAction(lambda x: x[0].lower())
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
446 oneLineCommand.setParseAction(lambda x: x[0].lower())
171
0b93f1a4076c lstripping commands
catherine@dellzilla
parents: 170
diff changeset
447 if self.blankLinesAllowed:
184
d1a87c14675b putting parsing variables under self
catherine@Elli.myhome.westell.com
parents: 183
diff changeset
448 self.blankLineTerminationParser = pyparsing.NoMatch
171
0b93f1a4076c lstripping commands
catherine@dellzilla
parents: 170
diff changeset
449 else:
186
bee79220382c unit tests passing
catherine@Elli.myhome.westell.com
parents: 185
diff changeset
450 self.blankLineTerminator = (pyparsing.lineEnd + pyparsing.lineEnd)('terminator')
184
d1a87c14675b putting parsing variables under self
catherine@Elli.myhome.westell.com
parents: 183
diff changeset
451 self.blankLineTerminator.setResultsName('terminator')
d1a87c14675b putting parsing variables under self
catherine@Elli.myhome.westell.com
parents: 183
diff changeset
452 self.blankLineTerminationParser = ((self.multilineCommand ^ oneLineCommand) + pyparsing.SkipTo(self.blankLineTerminator).setParseAction(lambda x: x[0].strip())('args') + self.blankLineTerminator)('statement')
203
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
453 self.multilineParser = (((self.multilineCommand ^ oneLineCommand) + SkipToLast(terminatorParser).setParseAction(lambda x: x[0].strip())('args') + terminatorParser)('statement') +
184
d1a87c14675b putting parsing variables under self
catherine@Elli.myhome.westell.com
parents: 183
diff changeset
454 pyparsing.SkipTo(outputParser ^ pipe ^ stringEnd).setParseAction(lambda x: x[0].strip())('suffix') + afterElements)
d1a87c14675b putting parsing variables under self
catherine@Elli.myhome.westell.com
parents: 183
diff changeset
455 self.singleLineParser = ((oneLineCommand + pyparsing.SkipTo(terminatorParser ^ stringEnd ^ pipe ^ outputParser).setParseAction(lambda x:x[0].strip())('args'))('statement') +
d1a87c14675b putting parsing variables under self
catherine@Elli.myhome.westell.com
parents: 183
diff changeset
456 pyparsing.Optional(terminatorParser) + afterElements)
186
bee79220382c unit tests passing
catherine@Elli.myhome.westell.com
parents: 185
diff changeset
457 #self.multilineParser = self.multilineParser.setResultsName('multilineParser')
bee79220382c unit tests passing
catherine@Elli.myhome.westell.com
parents: 185
diff changeset
458 #self.singleLineParser = self.singleLineParser.setResultsName('singleLineParser')
bee79220382c unit tests passing
catherine@Elli.myhome.westell.com
parents: 185
diff changeset
459 #self.blankLineTerminationParser = self.blankLineTerminationParser.setResultsName('blankLineTerminatorParser')
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
460 self.parser = (
173
10a45c030364 simplifying testcase
catherine@dellzilla
parents: 172
diff changeset
461 stringEnd |
184
d1a87c14675b putting parsing variables under self
catherine@Elli.myhome.westell.com
parents: 183
diff changeset
462 self.multilineParser |
d1a87c14675b putting parsing variables under self
catherine@Elli.myhome.westell.com
parents: 183
diff changeset
463 self.singleLineParser |
d1a87c14675b putting parsing variables under self
catherine@Elli.myhome.westell.com
parents: 183
diff changeset
464 self.blankLineTerminationParser |
d1a87c14675b putting parsing variables under self
catherine@Elli.myhome.westell.com
parents: 183
diff changeset
465 self.multilineCommand + pyparsing.SkipTo(stringEnd)
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
466 )
203
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
467 self.parser.ignore(pyparsing.quotedString).ignore(self.commentGrammars).ignore(self.commentInProgress)
169
429c8e984df4 all working, except \n\n terminators
catherine@dellzilla
parents: 168
diff changeset
468
154
606ad25c7f7e new experiment with ignore?
catherine@dellzilla
parents: 153
diff changeset
469 inputMark = pyparsing.Literal('<')
606ad25c7f7e new experiment with ignore?
catherine@dellzilla
parents: 153
diff changeset
470 inputMark.setParseAction(lambda x: '')
166
a3414ac38677 so close - now problem with terminator in string
catherine@dellzilla
parents: 165
diff changeset
471 inputFrom = pyparsing.Word(self.legalChars + '/\\')('inputFrom')
203
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
472 inputFrom.setParseAction(replace_with_file_contents)
154
606ad25c7f7e new experiment with ignore?
catherine@dellzilla
parents: 153
diff changeset
473 self.inputParser = inputMark + pyparsing.Optional(inputFrom)
203
68a609fc516b limit < infile slurp to cases where infile found
catherine@dellzilla
parents: 202
diff changeset
474 self.inputParser.ignore(pyparsing.quotedString).ignore(self.commentGrammars).ignore(self.commentInProgress)
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
475
165
3dc882a00e53 terminators + suffixes now preserved
catherine@dellzilla
parents: 164
diff changeset
476 def parsed(self, raw, **kwargs):
162
c50615cf814f merged with changes from work
catherine@Elli.myhome.westell.com
parents: 161
diff changeset
477 if isinstance(raw, ParsedString):
165
3dc882a00e53 terminators + suffixes now preserved
catherine@dellzilla
parents: 164
diff changeset
478 p = raw
3dc882a00e53 terminators + suffixes now preserved
catherine@dellzilla
parents: 164
diff changeset
479 else:
171
0b93f1a4076c lstripping commands
catherine@dellzilla
parents: 170
diff changeset
480 s = self.inputParser.transformString(raw.lstrip())
165
3dc882a00e53 terminators + suffixes now preserved
catherine@dellzilla
parents: 164
diff changeset
481 for (shortcut, expansion) in self.shortcuts.items():
201
6cdf53ce84f5 unknown
catherine@Elli.myhome.westell.com
parents: 200
diff changeset
482 if s.lower().startswith(shortcut):
165
3dc882a00e53 terminators + suffixes now preserved
catherine@dellzilla
parents: 164
diff changeset
483 s = s.replace(shortcut, expansion + ' ', 1)
3dc882a00e53 terminators + suffixes now preserved
catherine@dellzilla
parents: 164
diff changeset
484 break
3dc882a00e53 terminators + suffixes now preserved
catherine@dellzilla
parents: 164
diff changeset
485 result = self.parser.parseString(s)
3dc882a00e53 terminators + suffixes now preserved
catherine@dellzilla
parents: 164
diff changeset
486 result['command'] = result.multilineCommand or result.command
3dc882a00e53 terminators + suffixes now preserved
catherine@dellzilla
parents: 164
diff changeset
487 result['raw'] = raw
3dc882a00e53 terminators + suffixes now preserved
catherine@dellzilla
parents: 164
diff changeset
488 result['clean'] = self.commentGrammars.transformString(result.args)
3dc882a00e53 terminators + suffixes now preserved
catherine@dellzilla
parents: 164
diff changeset
489 result['expanded'] = s
166
a3414ac38677 so close - now problem with terminator in string
catherine@dellzilla
parents: 165
diff changeset
490 p = ParsedString(result.clean)
165
3dc882a00e53 terminators + suffixes now preserved
catherine@dellzilla
parents: 164
diff changeset
491 p.parsed = result
3dc882a00e53 terminators + suffixes now preserved
catherine@dellzilla
parents: 164
diff changeset
492 p.parser = self.parsed
3dc882a00e53 terminators + suffixes now preserved
catherine@dellzilla
parents: 164
diff changeset
493 for (key, val) in kwargs.items():
3dc882a00e53 terminators + suffixes now preserved
catherine@dellzilla
parents: 164
diff changeset
494 p.parsed[key] = val
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
495 return p
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
496
166
a3414ac38677 so close - now problem with terminator in string
catherine@dellzilla
parents: 165
diff changeset
497 def onecmd(self, line):
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
498 """Interpret the argument as though it had been typed in response
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
499 to the prompt.
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
500
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
501 This may be overridden, but should not normally need to be;
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
502 see the precmd() and postcmd() methods for useful execution hooks.
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
503 The return value is a flag indicating whether interpretation of
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
504 commands by the interpreter should stop.
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
505
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
506 This (`cmd2`) version of `onecmd` already override's `cmd`'s `onecmd`.
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
507
3
4520a1a073ff require terminator for redirection
catherine@cordelia
parents: 2
diff changeset
508 """
83
2176ce847939 merged copy to both clipboards in
catherine@Elli.myhome.westell.com
parents: 82
diff changeset
509 if not line:
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
510 return self.emptyline()
135
7c0a89fccf2b broken; midway through comments
catherine@Elli.myhome.westell.com
parents: 134
diff changeset
511 if not pyparsing.Or(self.commentGrammars).setParseAction(lambda x: '').transformString(line):
179
321e0cc35661 oh no... must accept prompt changes
catherine@Elli.myhome.westell.com
parents: 177
diff changeset
512 return 0 # command was empty except for comments
154
606ad25c7f7e new experiment with ignore?
catherine@dellzilla
parents: 153
diff changeset
513 try:
606ad25c7f7e new experiment with ignore?
catherine@dellzilla
parents: 153
diff changeset
514 statement = self.parsed(line)
170
310ebf4baa7a \n endings still squirrely; watch blank spaces in saved files
catherine@dellzilla
parents: 169
diff changeset
515 while statement.parsed.multilineCommand and (statement.parsed.terminator == ''):
192
c0d4c7ba14a9 added settable timings param
catherine@Elli.myhome.westell.com
parents: 191
diff changeset
516 statement = '%s\n%s' % (statement.parsed.raw,
c0d4c7ba14a9 added settable timings param
catherine@Elli.myhome.westell.com
parents: 191
diff changeset
517 self.pseudo_raw_input(self.continuationPrompt))
c0d4c7ba14a9 added settable timings param
catherine@Elli.myhome.westell.com
parents: 191
diff changeset
518 statement = self.parsed(statement)
154
606ad25c7f7e new experiment with ignore?
catherine@dellzilla
parents: 153
diff changeset
519 except Exception, e:
606ad25c7f7e new experiment with ignore?
catherine@dellzilla
parents: 153
diff changeset
520 print e
606ad25c7f7e new experiment with ignore?
catherine@dellzilla
parents: 153
diff changeset
521 return 0
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
522
177
f2b1643b5173 argh, zero-arg commands were dying
catherine@dellzilla
parents: 176
diff changeset
523 if not statement.parsed.command:
175
72de7d8566e2 tests finally passing
catherine@dellzilla
parents: 174
diff changeset
524 return 0
72de7d8566e2 tests finally passing
catherine@dellzilla
parents: 174
diff changeset
525
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
526 statekeeper = None
25
6948d1f9e4b4 missing xclip half-working
catherine@localhost
parents: 24
diff changeset
527 stop = 0
154
606ad25c7f7e new experiment with ignore?
catherine@dellzilla
parents: 153
diff changeset
528
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
529 if statement.parsed.pipeTo:
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
530 redirect = subprocess.Popen(statement.parsed.pipeTo, shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
51
26e33f64f68e trying new unified pipe and redirect
catherine@localhost
parents: 50
diff changeset
531 statekeeper = Statekeeper(self, ('stdout',))
47
927bc07467de fixed misfind of editor
catherine@cordelia
parents: 46
diff changeset
532 self.stdout = redirect.stdin
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
533 elif statement.parsed.output:
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
534 statekeeper = Statekeeper(self, ('stdout',))
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
535 if statement.parsed.outputTo:
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
536 mode = 'w'
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
537 if statement.parsed.output == '>>':
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
538 mode = 'a'
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
539 try:
202
da8c265934ee liberal use of os.path.expanduser
catherine@dellzilla
parents: 201
diff changeset
540 self.stdout = open(os.path.expanduser(statement.parsed.outputTo), mode)
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
541 except OSError, e:
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
542 print e
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
543 return 0
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
544 else:
51
26e33f64f68e trying new unified pipe and redirect
catherine@localhost
parents: 50
diff changeset
545 statekeeper = Statekeeper(self, ('stdout',))
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
546 self.stdout = tempfile.TemporaryFile()
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
547 if statement.parsed.output == '>>':
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
548 self.stdout.write(getPasteBuffer())
133
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
549 try:
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
550 # "heart" of the command, replace's cmd's onecmd()
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
551 self.lastcmd = statement.parsed.expanded
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
552 try:
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
553 func = getattr(self, 'do_' + statement.parsed.command)
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
554 except AttributeError:
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
555 return self.default(statement)
192
c0d4c7ba14a9 added settable timings param
catherine@Elli.myhome.westell.com
parents: 191
diff changeset
556 timestart = datetime.datetime.now()
c0d4c7ba14a9 added settable timings param
catherine@Elli.myhome.westell.com
parents: 191
diff changeset
557 stop = func(statement)
c0d4c7ba14a9 added settable timings param
catherine@Elli.myhome.westell.com
parents: 191
diff changeset
558 if self.timing:
c0d4c7ba14a9 added settable timings param
catherine@Elli.myhome.westell.com
parents: 191
diff changeset
559 print 'Elapsed: %s' % str(datetime.datetime.now() - timestart)
133
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
560 except Exception, e:
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
561 print e
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
562 try:
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
563 if statement.parsed.command not in self.excludeFromHistory:
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
564 self.history.append(statement.parsed.raw)
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
565 finally:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
566 if statekeeper:
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
567 if statement.parsed.output and not statement.parsed.outputTo:
27
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
568 self.stdout.seek(0)
134
c28ae4f75c15 incorporated changes from branch at work
catherine@Elli.myhome.westell.com
parents: 133
diff changeset
569 try:
c28ae4f75c15 incorporated changes from branch at work
catherine@Elli.myhome.westell.com
parents: 133
diff changeset
570 writeToPasteBuffer(self.stdout.read())
c28ae4f75c15 incorporated changes from branch at work
catherine@Elli.myhome.westell.com
parents: 133
diff changeset
571 except Exception, e:
c28ae4f75c15 incorporated changes from branch at work
catherine@Elli.myhome.westell.com
parents: 133
diff changeset
572 print str(e)
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
573 elif statement.parsed.pipeTo:
52
49de899a05a8 new unified pipe and redirect works on wc
catherine@localhost
parents: 51
diff changeset
574 for result in redirect.communicate():
49de899a05a8 new unified pipe and redirect works on wc
catherine@localhost
parents: 51
diff changeset
575 statekeeper.stdout.write(result or '')
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
576 self.stdout.close()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
577 statekeeper.restore()
52
49de899a05a8 new unified pipe and redirect works on wc
catherine@localhost
parents: 51
diff changeset
578
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
579 return stop
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
580
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
581 def pseudo_raw_input(self, prompt):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
582 """copied from cmd's cmdloop; like raw_input, but accounts for changed stdin, stdout"""
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
583
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
584 if self.use_rawinput:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
585 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
586 line = raw_input(prompt)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
587 except EOFError:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
588 line = 'EOF'
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
589 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
590 self.stdout.write(prompt)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
591 self.stdout.flush()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
592 line = self.stdin.readline()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
593 if not len(line):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
594 line = 'EOF'
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
595 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
596 if line[-1] == '\n': # this was always true in Cmd
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
597 line = line[:-1]
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
598 return line
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
599
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
600 def cmdloop(self, intro=None):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
601 """Repeatedly issue a prompt, accept input, parse an initial prefix
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
602 off the received input, and dispatch to action methods, passing them
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
603 the remainder of the line as argument.
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
604 """
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
605
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
606 # An almost perfect copy from Cmd; however, the pseudo_raw_input portion
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
607 # has been split out so that it can be called separately
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
608
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
609 self.preloop()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
610 if self.use_rawinput and self.completekey:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
611 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
612 import readline
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
613 self.old_completer = readline.get_completer()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
614 readline.set_completer(self.complete)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
615 readline.parse_and_bind(self.completekey+": complete")
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
616 except ImportError:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
617 pass
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
618 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
619 if intro is not None:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
620 self.intro = intro
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
621 if self.intro:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
622 self.stdout.write(str(self.intro)+"\n")
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
623 stop = None
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
624 while not stop:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
625 if self.cmdqueue:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
626 line = self.cmdqueue.pop(0)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
627 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
628 line = self.pseudo_raw_input(self.prompt)
103
e4daf715fc31 echo on
catherine@dellzilla
parents: 100
diff changeset
629 if (self.echo) and (isinstance(self.stdin, file)):
e4daf715fc31 echo on
catherine@dellzilla
parents: 100
diff changeset
630 self.stdout.write(line + '\n')
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
631 line = self.precmd(line)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
632 stop = self.onecmd(line)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
633 stop = self.postcmd(stop, line)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
634 self.postloop()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
635 finally:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
636 if self.use_rawinput and self.completekey:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
637 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
638 import readline
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
639 readline.set_completer(self.old_completer)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
640 except ImportError:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
641 pass
43
e03a8c03ac37 command-line args working
catherine@cordelia
parents: 42
diff changeset
642 return stop
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
643
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
644 def do_EOF(self, arg):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
645 return True
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
646 do_eof = do_EOF
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
647
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
648 def showParam(self, param):
133
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
649 param = param.strip().lower()
199
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
650 for p in self.settable:
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
651 if p.startswith(param):
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
652 val = getattr(self, p)
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
653 self.stdout.write('%s: %s\n' % (p, str(getattr(self, p))))
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
654
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
655 def do_quit(self, arg):
43
e03a8c03ac37 command-line args working
catherine@cordelia
parents: 42
diff changeset
656 return self._STOP_AND_EXIT
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
657 do_exit = do_quit
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
658 do_q = do_quit
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
659
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
660 def do_show(self, arg):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
661 'Shows value of a parameter'
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
662 if arg.strip():
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
663 self.showParam(arg)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
664 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
665 for param in self.settable:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
666 self.showParam(param)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
667
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
668 def do_set(self, arg):
199
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
669 '''Sets a cmd2 parameter. Accepts abbreviated parameter names so long as there is no ambiguity.
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
670 Call without arguments for a list of settable parameters with their values.'''
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
671 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
672 paramName, val = arg.split(None, 1)
133
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
673 paramName = paramName.strip().lower()
199
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
674 hits = [paramName in p for p in self.settable]
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
675 if hits.count(True) == 1:
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
676 paramName = self.settable[hits.index(True)]
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
677 currentVal = getattr(self, paramName)
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
678 if (val[0] == val[-1]) and val[0] in ("'", '"'):
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
679 val = val[1:-1]
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
680 else:
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
681 val = cast(currentVal, val)
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
682 setattr(self, paramName, val)
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
683 self.stdout.write('%s - was: %s\nnow: %s\n' % (paramName, currentVal, val))
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
684 else:
12c2d23caf19 added unit check for doublepipe
catherine@dellzilla
parents: 197
diff changeset
685 self.do_show(paramName)
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
686 except (ValueError, AttributeError, NotSettableError), e:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
687 self.do_show(arg)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
688
182
1c21db096f49 switched literal newline to lineEnd
catherine@Elli.myhome.westell.com
parents: 181
diff changeset
689 def do_pause(self, arg):
1c21db096f49 switched literal newline to lineEnd
catherine@Elli.myhome.westell.com
parents: 181
diff changeset
690 'Displays the specified text then waits for the user to press RETURN.'
1c21db096f49 switched literal newline to lineEnd
catherine@Elli.myhome.westell.com
parents: 181
diff changeset
691 raw_input(arg + '\n')
1c21db096f49 switched literal newline to lineEnd
catherine@Elli.myhome.westell.com
parents: 181
diff changeset
692
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
693 def do_shell(self, arg):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
694 'execute a command as if at the OS prompt.'
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
695 os.system(arg)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
696
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
697 def do_history(self, arg):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
698 """history [arg]: lists past commands issued
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
699
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
700 no arg -> list all
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
701 arg is integer -> list one history item, by index
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
702 arg is string -> string search
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
703 arg is /enclosed in forward-slashes/ -> regular expression search
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
704 """
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
705 if arg:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
706 history = self.history.get(arg)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
707 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
708 history = self.history
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
709 for hi in history:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
710 self.stdout.write(hi.pr())
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
711 def last_matching(self, arg):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
712 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
713 if arg:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
714 return self.history.get(arg)[-1]
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
715 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
716 return self.history[-1]
133
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
717 except IndexError:
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
718 return None
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
719 def do_list(self, arg):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
720 """list [arg]: lists last command issued
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
721
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
722 no arg -> list absolute last
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
723 arg is integer -> list one history item, by index
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
724 - arg, arg - (integer) -> list up to or after #arg
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
725 arg is string -> list last command matching string search
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
726 arg is /enclosed in forward-slashes/ -> regular expression search
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
727 """
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
728 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
729 self.stdout.write(self.last_matching(arg).pr())
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
730 except:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
731 pass
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
732 do_hi = do_history
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
733 do_l = do_list
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
734 do_li = do_list
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
735
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
736 def do_ed(self, arg):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
737 """ed: edit most recent command in text editor
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
738 ed [N]: edit numbered command from history
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
739 ed [filename]: edit specified file name
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
740
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
741 commands are run after editor is closed.
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
742 "set edit (program-name)" or set EDITOR environment variable
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
743 to control which editing program is used."""
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
744 if not self.editor:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
745 print "please use 'set editor' to specify your text editing program of choice."
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
746 return
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
747 filename = self.defaultFileName
133
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
748 if arg:
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
749 try:
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
750 buffer = self.last_matching(int(arg))
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
751 except ValueError:
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
752 filename = arg
133
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
753 buffer = ''
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
754 else:
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
755 buffer = self.history[-1]
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
756
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
757 if buffer:
202
da8c265934ee liberal use of os.path.expanduser
catherine@dellzilla
parents: 201
diff changeset
758 f = open(os.path.expanduser(filename), 'w')
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
759 f.write(buffer or '')
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
760 f.close()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
761
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
762 os.system('%s %s' % (self.editor, filename))
48
34fb41095451 avoiding do_load overload
catherine.devlin@gmail.com
parents: 47
diff changeset
763 self.do__load(filename)
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
764 do_edit = do_ed
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
765
91
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
766 saveparser = (pyparsing.Optional(pyparsing.Word(pyparsing.nums)^'*')("idx") +
157
10e917acf787 wow, parsing is broken
catherine@dellzilla
parents: 156
diff changeset
767 pyparsing.Optional(pyparsing.Word(legalChars + '/\\'))("fname") +
91
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
768 pyparsing.stringEnd)
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
769 def do_save(self, arg):
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
770 """`save [N] [filename.ext]`
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
771 Saves command from history to file.
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
772 N => Number of command (from history), or `*`;
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
773 most recent command if omitted"""
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
774
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
775 try:
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
776 args = self.saveparser.parseString(arg)
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
777 except pyparsing.ParseException:
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
778 print self.do_save.__doc__
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
779 return
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
780 fname = args.fname or self.defaultFileName
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
781 if args.idx == '*':
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
782 saveme = '\n\n'.join(self.history[:])
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
783 elif args.idx:
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
784 saveme = self.history[int(args.idx)-1]
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
785 else:
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
786 saveme = self.history[-1]
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
787 try:
202
da8c265934ee liberal use of os.path.expanduser
catherine@dellzilla
parents: 201
diff changeset
788 f = open(os.path.expanduser(fname), 'w')
91
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
789 f.write(saveme)
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
790 f.close()
91
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
791 print 'Saved to %s' % (fname)
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
792 except Exception, e:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
793 print 'Error saving %s: %s' % (fname, str(e))
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
794
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
795 def do_load(self, fname=None):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
796 """Runs command(s) from a file."""
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
797 if fname is None:
200
05c0e28306d3 expanding ~ in file names
catherine@Elli.myhome.westell.com
parents: 199
diff changeset
798 fname = self.defaultFileName
05c0e28306d3 expanding ~ in file names
catherine@Elli.myhome.westell.com
parents: 199
diff changeset
799 fname = os.path.expanduser(fname)
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
800 keepstate = Statekeeper(self, ('stdin','use_rawinput','prompt','continuationPrompt'))
41
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
801 if isinstance(fname, file):
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
802 self.stdin = fname
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
803 else:
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
804 try:
202
da8c265934ee liberal use of os.path.expanduser
catherine@dellzilla
parents: 201
diff changeset
805 self.stdin = open(os.path.expanduser(fname), 'r')
41
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
806 except IOError, e:
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
807 try:
202
da8c265934ee liberal use of os.path.expanduser
catherine@dellzilla
parents: 201
diff changeset
808 self.stdin = open('%s.%s' % (os.path.expanduser(fname), self.defaultExtension), 'r')
41
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
809 except IOError:
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
810 print 'Problem opening file %s: \n%s' % (fname, e)
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
811 keepstate.restore()
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
812 return
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
813 self.use_rawinput = False
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
814 self.prompt = self.continuationPrompt = ''
42
b3200c6e5763 inserting exception for quit...
catherine@cordelia
parents: 41
diff changeset
815 stop = self.cmdloop()
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
816 self.stdin.close()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
817 keepstate.restore()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
818 self.lastcmd = ''
48
34fb41095451 avoiding do_load overload
catherine.devlin@gmail.com
parents: 47
diff changeset
819 return (stop == self._STOP_AND_EXIT) and self._STOP_AND_EXIT
34fb41095451 avoiding do_load overload
catherine.devlin@gmail.com
parents: 47
diff changeset
820 do__load = do_load # avoid an unfortunate legacy use of do_load from sqlpython
43
e03a8c03ac37 command-line args working
catherine@cordelia
parents: 42
diff changeset
821
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
822 def do_run(self, arg):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
823 """run [arg]: re-runs an earlier command
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
824
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
825 no arg -> run most recent command
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
826 arg is integer -> run one history item, by index
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
827 arg is string -> run most recent command by string search
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
828 arg is /enclosed in forward-slashes/ -> run most recent by regex
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
829 """
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
830 'run [N]: runs the SQL that was run N commands ago'
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
831 runme = self.last_matching(arg)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
832 print runme
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
833 if runme:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
834 runme = self.precmd(runme)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
835 stop = self.onecmd(runme)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
836 stop = self.postcmd(stop, runme)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
837 do_r = do_run
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
838
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
839 def fileimport(self, statement, source):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
840 try:
202
da8c265934ee liberal use of os.path.expanduser
catherine@dellzilla
parents: 201
diff changeset
841 f = open(os.path.expanduser(source))
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
842 except IOError:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
843 self.stdout.write("Couldn't read from file %s\n" % source)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
844 return ''
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
845 data = f.read()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
846 f.close()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
847 return data
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
848
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
849 class HistoryItem(str):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
850 def __init__(self, instr):
121
fe432d010ecc going to attempt 2.4 and 2.6 compatibility
catherine@dellzilla
parents: 119
diff changeset
851 str.__init__(self)
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
852 self.lowercase = self.lower()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
853 self.idx = None
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
854 def pr(self):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
855 return '-------------------------[%d]\n%s\n' % (self.idx, str(self))
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
856
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
857 class History(list):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
858 rangeFrom = re.compile(r'^([\d])+\s*\-$')
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
859 def append(self, new):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
860 new = HistoryItem(new)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
861 list.append(self, new)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
862 new.idx = len(self)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
863 def extend(self, new):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
864 for n in new:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
865 self.append(n)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
866 def get(self, getme):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
867 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
868 getme = int(getme)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
869 if getme < 0:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
870 return self[:(-1 * getme)]
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
871 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
872 return [self[getme-1]]
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
873 except IndexError:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
874 return []
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
875 except (ValueError, TypeError):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
876 getme = getme.strip()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
877 mtch = self.rangeFrom.search(getme)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
878 if mtch:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
879 return self[(int(mtch.group(1))-1):]
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
880 if getme.startswith(r'/') and getme.endswith(r'/'):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
881 finder = re.compile(getme[1:-1], re.DOTALL | re.MULTILINE | re.IGNORECASE)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
882 def isin(hi):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
883 return finder.search(hi)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
884 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
885 def isin(hi):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
886 return (getme.lower() in hi.lowercase)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
887 return [itm for itm in self if isin(itm)]
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
888
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
889 class NotSettableError(Exception):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
890 pass
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
891
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
892 def cast(current, new):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
893 """Tries to force a new value into the same type as the current."""
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
894 typ = type(current)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
895 if typ == bool:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
896 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
897 return bool(int(new))
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
898 except ValueError, TypeError:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
899 pass
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
900 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
901 new = new.lower()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
902 except:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
903 pass
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
904 if (new=='on') or (new[0] in ('y','t')):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
905 return True
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
906 if (new=='off') or (new[0] in ('n','f')):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
907 return False
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
908 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
909 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
910 return typ(new)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
911 except:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
912 pass
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
913 print "Problem setting parameter (now %s) to %s; incorrect type?" % (current, new)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
914 return current
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
915
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
916 class Statekeeper(object):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
917 def __init__(self, obj, attribs):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
918 self.obj = obj
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
919 self.attribs = attribs
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
920 self.save()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
921 def save(self):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
922 for attrib in self.attribs:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
923 setattr(self, attrib, getattr(self.obj, attrib))
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
924 def restore(self):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
925 for attrib in self.attribs:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
926 setattr(self.obj, attrib, getattr(self, attrib))
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
927
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
928 class Borg(object):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
929 '''All instances of any Borg subclass will share state.
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
930 from Python Cookbook, 2nd Ed., recipe 6.16'''
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
931 _shared_state = {}
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
932 def __new__(cls, *a, **k):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
933 obj = object.__new__(cls, *a, **k)
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
934 obj.__dict__ = cls._shared_state
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
935 return obj
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
936
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
937 class OutputTrap(Borg):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
938 '''Instantiate an OutputTrap to divert/capture ALL stdout output. For use in unit testing.
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
939 Call `tearDown()` to return to normal output.'''
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
940 def __init__(self):
105
130340609e19 testing beginning to work?
catherine@dellzilla
parents: 104
diff changeset
941 self.old_stdout = sys.stdout
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
942 self.trap = tempfile.TemporaryFile()
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
943 sys.stdout = self.trap
105
130340609e19 testing beginning to work?
catherine@dellzilla
parents: 104
diff changeset
944 def read(self):
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
945 self.trap.seek(0)
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
946 result = self.trap.read()
105
130340609e19 testing beginning to work?
catherine@dellzilla
parents: 104
diff changeset
947 self.trap.truncate(0)
130340609e19 testing beginning to work?
catherine@dellzilla
parents: 104
diff changeset
948 return result.strip('\x00')
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
949 def tearDown(self):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
950 sys.stdout = self.old_stdout
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
951
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
952 class Cmd2TestCase(unittest.TestCase):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
953 '''Subclass this, setting CmdApp and transcriptFileName, to make a unittest.TestCase class
109
78c4db4c2045 all done but the proper packaging
catherine@dellzilla
parents: 108
diff changeset
954 that will execute the commands in transcriptFileName and expect the results shown.
78c4db4c2045 all done but the proper packaging
catherine@dellzilla
parents: 108
diff changeset
955 See example.py'''
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
956 CmdApp = None
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
957 transcriptFileName = ''
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
958 def setUp(self):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
959 if self.CmdApp:
105
130340609e19 testing beginning to work?
catherine@dellzilla
parents: 104
diff changeset
960 self.outputTrap = OutputTrap()
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
961 self.cmdapp = self.CmdApp()
173
10a45c030364 simplifying testcase
catherine@dellzilla
parents: 172
diff changeset
962 try:
202
da8c265934ee liberal use of os.path.expanduser
catherine@dellzilla
parents: 201
diff changeset
963 tfile = open(os.path.expanduser(self.transcriptFileName))
180
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
964 self.transcript = iter(tfile.readlines())
173
10a45c030364 simplifying testcase
catherine@dellzilla
parents: 172
diff changeset
965 tfile.close()
10a45c030364 simplifying testcase
catherine@dellzilla
parents: 172
diff changeset
966 except IOError:
10a45c030364 simplifying testcase
catherine@dellzilla
parents: 172
diff changeset
967 self.transcript = []
181
24eff658997b accepts wildcards in tests, maybe?
catherine@Elli.myhome.westell.com
parents: 180
diff changeset
968 def assertEqualEnough(self, got, expected, message):
24eff658997b accepts wildcards in tests, maybe?
catherine@Elli.myhome.westell.com
parents: 180
diff changeset
969 got = got.strip().splitlines()
24eff658997b accepts wildcards in tests, maybe?
catherine@Elli.myhome.westell.com
parents: 180
diff changeset
970 expected = expected.strip().splitlines()
24eff658997b accepts wildcards in tests, maybe?
catherine@Elli.myhome.westell.com
parents: 180
diff changeset
971 self.assertEqual(len(got), len(expected), message)
24eff658997b accepts wildcards in tests, maybe?
catherine@Elli.myhome.westell.com
parents: 180
diff changeset
972 for (linegot, lineexpected) in zip(got, expected):
24eff658997b accepts wildcards in tests, maybe?
catherine@Elli.myhome.westell.com
parents: 180
diff changeset
973 matchme = re.escape(lineexpected.strip()).replace('\\*', '.*'). \
24eff658997b accepts wildcards in tests, maybe?
catherine@Elli.myhome.westell.com
parents: 180
diff changeset
974 replace('\\ ', ' ')
24eff658997b accepts wildcards in tests, maybe?
catherine@Elli.myhome.westell.com
parents: 180
diff changeset
975 self.assert_(re.match(matchme, linegot.strip()), message)
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
976 def testall(self):
180
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
977 if self.CmdApp:
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
978 lineNum = 0
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
979 try:
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
980 line = self.transcript.next()
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
981 while True:
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
982 while not line.startswith(self.cmdapp.prompt):
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
983 line = self.transcript.next()
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
984 command = [line[len(self.cmdapp.prompt):]]
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
985 line = self.transcript.next()
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
986 while line.startswith(self.cmdapp.continuationPrompt):
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
987 command.append(line[len(self.cmdapp.continuationPrompt):])
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
988 line = self.transcript.next()
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
989 command = ''.join(command)
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
990 self.cmdapp.onecmd(command)
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
991 result = self.outputTrap.read()
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
992 if line.startswith(self.cmdapp.prompt):
181
24eff658997b accepts wildcards in tests, maybe?
catherine@Elli.myhome.westell.com
parents: 180
diff changeset
993 self.assertEqualEnough(result.strip(), '',
180
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
994 '\nFile %s, line %d\nCommand was:\n%s\nExpected: (nothing) \nGot:\n%s\n' %
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
995 (self.transcriptFileName, lineNum, command, result))
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
996 continue
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
997 expected = []
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
998 while not line.startswith(self.cmdapp.prompt):
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
999 expected.append(line)
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
1000 line = self.transcript.next()
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
1001 expected = ''.join(expected)
181
24eff658997b accepts wildcards in tests, maybe?
catherine@Elli.myhome.westell.com
parents: 180
diff changeset
1002 self.assertEqualEnough(expected.strip(), result.strip(),
180
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
1003 '\nFile %s, line %d\nCommand was:\n%s\nExpected:\n%s\nGot:\n%s\n' %
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
1004 (self.transcriptFileName, lineNum, command, expected, result))
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
1005 # this needs to account for a line-by-line strip()ping
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
1006 except StopIteration:
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
1007 pass
951c124b0404 test almost fixed
catherine@Elli.myhome.westell.com
parents: 179
diff changeset
1008 # catch the final output?
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
1009 def tearDown(self):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
1010 if self.CmdApp:
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
1011 self.outputTrap.tearDown()
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
1012
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
1013 if __name__ == '__main__':
158
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
1014 doctest.testmod(optionflags = doctest.NORMALIZE_WHITESPACE)
87d3f3203b96 accept blanks
catherine@Elli.myhome.westell.com
parents: 157
diff changeset
1015 #c = Cmd()