Skip to content

Commit ad6154d

Browse files
committed
ENH: Adds innitial tests and bugfixes. Also, adds support for a cache
failure in the event where a user tries to cache a file that does not exist or should be skipped.
1 parent 5f47bec commit ad6154d

21 files changed

+1615
-803
lines changed

LICENSE

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The server is the main routing station for messages between the clients and the
2828
tracer. The server is responsible for validating that the messages from the
2929
clients are well formed and routing them to the tracer. A single server may
3030
manage multiple tracers, so it is responsible for making sure that connections
31-
are routed to the proper place. The server can clean up tracer processes whos
31+
are routed to the proper place. The server can clean up tracer processes whose
3232
clients have become inactive if the server manager decides.
3333

3434

@@ -57,7 +57,7 @@ Which steps into the next expression on the tracer. The client may also send:
5757
"p": "a + b"
5858
}
5959

60-
This command is equivelent to evaluating the code `a + b` in the current stack
60+
This command is equivalent to evaluating the code `a + b` in the current stack
6161
frame.
6262

6363
The server will always send back data that is formatted in this way.

emacs/qdb.el renamed to client/emacs/qdb.el

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
;;
2+
;; Copyright 2014 Quantopian, Inc.
3+
;;
4+
;; Licensed under the Apache License, Version 2.0 (the "License");
5+
;; you may not use this file except in compliance with the License.
6+
;; You may obtain a copy of the License at
7+
;;
8+
;; http://www.apache.org/licenses/LICENSE-2.0
9+
;;
10+
;; Unless required by applicable law or agreed to in writing, software
11+
;; distributed under the License is distributed on an "AS IS" BASIS,
12+
;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
;; See the License for the specific language governing permissions and
14+
;; limitations under the License.
115
(defvar qdb-executable (executable-find "qdb-cli")
216
"Program used by `run-qdb'")
317

@@ -20,7 +34,7 @@
2034
'("b" "break"
2135
"c" "continue"
2236
"cl" "clear"
23-
"list"
37+
"list" "l"
2438
"n" "next"
2539
"q" "quit"
2640
"s" "step"
@@ -51,21 +65,29 @@
5165

5266
(defun qdb-open-out-file (out-file qdb-buffer)
5367
"Opens the out-file in a tail -f type mode and pops back the repl."
68+
(call-process-shell-command "touch" nil nil nil out-file)
5469
(start-process "qdb-out" "*qdb-out*" "tail" "-f" out-file)
5570
(switch-to-buffer "*qdb-out*")
5671
(read-only-mode)
5772
(pop-to-buffer qdb-buffer))
5873

74+
75+
(defvar qdb-default-uuid "qdb")
76+
(defvar qdb-default-addr "wss://localhost:8001/websocket/{uuid}")
77+
(defvar qdb-default-auth "")
78+
5979
(defun run-qdb (uuid addr auth)
6080
"Starts a new qdb session inside of emacs."
61-
(interactive "suuid (default: \"qdb\"): \nsaddr (default: \
62-
\"ws://localhost:8002/debug_session/{uuid}\"): \nsauth (default: \"\"): ")
81+
(interactive "suuid: \nsaddr: \nsauth: ")
6382
(let* ((real-uuid (if (not (string= uuid ""))
6483
uuid
65-
"qdb"))
84+
qdb-default-uuid))
6685
(real-addr (if (not (string= addr ""))
6786
addr
68-
"ws://localhost:8002/debug_session/{uuid}"))
87+
qdb-default-addr))
88+
(real-auth (if (not (string= auth ""))
89+
auth
90+
qdb-default-auth))
6991
(qdb-buffer (make-comint-in-buffer
7092
"qdb" nil qdb-executable
7193
nil "-w" real-addr "-u" real-uuid "-a" auth)))

emacs/qdb.py renamed to client/qdb-cli

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,30 @@
11
#!/usr/bin/env python
2+
#
3+
# Copyright 2014 Quantopian, Inc.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
216
from __future__ import print_function
317

418
import argparse
19+
from ast import literal_eval
520
from cmd import Cmd
621
import json
722
from multiprocessing import Process
23+
import os
824

925
from websocket import create_connection
1026

11-
DEFAULT_WS_ADDRESS = 'ws://localhost:8002/debug_session/{uuid}'
27+
DEFAULT_WS_ADDRESS = 'ws://localhost:8002/websocket/{uuid}'
1228
DEFAULT_UUID = 'qdb'
1329

1430
# The format of the outfile
@@ -50,7 +66,7 @@ def fmt_msg(self, event, payload):
5066
"""
5167
Formats a message to send to the server.
5268
"""
53-
if not payload:
69+
if payload is None:
5470
return json.dumps({'e': event})
5571
return json.dumps({
5672
'e': event,
@@ -87,25 +103,16 @@ def postcmd(self, stop, line):
87103
"""
88104
return stop or self._stop
89105

90-
def parse_break_arg(self, arg):
106+
def parse_break_arg(self, arg, temp=False):
91107
"""
92108
Parses a breakpoint payload out of an argument.
93109
"""
94-
args = arg.split()
95-
if len(args) == 1:
96-
print('*** error: break_arg: Missing line number')
97-
file_ = args[0]
98-
line = args[1]
99-
func = None
100-
cond = None
101-
for pair in zip([func, cond], args[2:]):
102-
pair[0] = pair[1]
103-
return {
104-
'file': file_,
105-
'line': line,
106-
'func': func,
107-
'cond': cond,
108-
}
110+
if not arg:
111+
return None
112+
try:
113+
return literal_eval(arg)
114+
except ValueError:
115+
return None
109116

110117
def missing_argument(self, cmd):
111118
print('*** error: %s: missing argument(s)' % cmd)
@@ -140,7 +147,7 @@ def do_watch(self, arg):
140147
if not arg:
141148
self.missing_argument('w(atch)')
142149
return
143-
self.send_command('set_watch', arg.split())
150+
self.send_command('set_watch', [arg])
144151
do_w = do_watch
145152

146153
def do_unwatch(self, arg):
@@ -179,8 +186,11 @@ def do_list(self, arg):
179186
file_ = args[0]
180187
start = None
181188
end = None
182-
for pair in zip([start, end], args[1:]):
183-
pair[0] = pair[1]
189+
try:
190+
start = args[1]
191+
end = args[2]
192+
except IndexError:
193+
pass
184194
self.send_command('list', {
185195
'file': file_,
186196
'start': start,
@@ -248,7 +258,7 @@ def event_stack(self, payload):
248258
def event_watchlist(self, payload):
249259
self.writeln('watchlist: [')
250260
for watched in payload:
251-
self.writeln(' > %s: %s' % (watched['name'], watched['value']))
261+
self.writeln(' > %s: %s' % (watched['expr'], watched['value']))
252262
self.writeln(']')
253263

254264
def event_breakpoints(self, payload):
@@ -263,6 +273,9 @@ def event_error(self, payload):
263273
def event_return(self, payload):
264274
self.writeln('--> returning with %s' % payload)
265275

276+
def event_disabled(self, payload):
277+
self.writeln('Disabled, goodbye.')
278+
266279
if __name__ == '__main__':
267280
argparser = argparse.ArgumentParser()
268281
argparser.add_argument(

0 commit comments

Comments
 (0)