Skip to content

Commit efbace7

Browse files
tandembotrageandqq
authored andcommitted
Cut release from b0234b91c64d08f69e15c15bf6579f358c93ea94
0 parents  commit efbace7

File tree

130 files changed

+22010
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+22010
-0
lines changed

LICENSE.txt

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

README.md

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# Tandem
2+
3+
Tandem is an add-on for your favorite text editor that enables peer-to-peer
4+
collaborative editing across different editors.
5+
6+
This repository contains code for the Vim plugin. For more details on Tandem,
7+
visit [our website](http://typeintandem.com), or our [mono-repository
8+
containing all other source code.](https://github.com/typeintandem/tandem)
9+
10+
*Note: Vim is not officially supported due to its lack of thread-safety.
11+
Instead we recommend Tandem with Neovim, one of our officially supported
12+
plugins.
13+
We added functionality to this editor since it was a minimal amount of work to
14+
port the logic - please use at your own risk.*
15+
16+
## Installation
17+
To install, you must have a copy of vim compiled with python installed.
18+
You must also have `python3` and `node.js` installed.
19+
20+
Vim users have the option of installing in one of the following ways:
21+
- **[Recommended]** Using your favourite plugin manager (e.g. Vundle, vim-plug,
22+
etc.) Tandem should be compatible with most popular plugin managers
23+
- Installing Tandem directly. You’ll need download this repository. In your
24+
`~/.vimrc`, make sure you source the `tandem_vim.vim` file:
25+
`source /path/to/tandem/plugin/tandem_vim.vim`
26+
27+
## Usage
28+
Tandem users can choose either start a collaborative session or join an
29+
existing one. Starting a collaborative session will share the contents of your
30+
current buffer. Joining an existing session will open it’s contents in a new
31+
buffer.
32+
33+
Please use one of the following commands:
34+
- `:Tandem` - creates a new tandem session and prints the session ID
35+
- `:Tandem <session_id>` - joins an existing tandem session with the specified
36+
session ID
37+
- `:TandemStop` - leaves the current session
38+
- `:TandemSession` - prints the current session ID
39+
40+
It is recommended to leave the session before exiting vim, but that process
41+
should be automated.
42+
43+
## License
44+
Copyright (c) 2018 Team Lightly
45+
46+
Licensed under the "Lightly-Modified Apache License", a variant of the Apache
47+
License, Version 2.0 (the "License"); you may not use this file except in
48+
compliance with the License.
49+
50+
See [LICENSE.txt](LICENSE.txt)
51+
52+
This license is essentially the Apache License 2.0, except for an added a
53+
clause that requires you to use your own servers instead of ours if you do
54+
modify Tandem.
55+
You can also modify this in the configuration file at:
56+
`agent/tandem/agent/configuration.py`
57+
58+
## Authors
59+
Team Lightly
60+
[Geoffrey Yu](https://github.com/geoffxy), [Jamiboy
61+
Mohammad](https://github.com/jamiboym) and [Sameer
62+
Chitley](https://github.com/rageandqq)
63+
64+
We are a team of senior Software Engineering students at the University of
65+
Waterloo.
66+
Tandem was created as our [Engineering Capstone Design
67+
Project](https://uwaterloo.ca/capstone-design).

plugin/tandem_lib/__init__.py

Whitespace-only changes.

plugin/tandem_lib/agent/__init__.py

Whitespace-only changes.
170 Bytes
Binary file not shown.

plugin/tandem_lib/agent/main.py

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
import signal
2+
import logging
3+
import threading
4+
import argparse
5+
from tandem.agent.executables.agent import TandemAgent
6+
7+
should_shutdown = threading.Event()
8+
9+
10+
def signal_handler(signal, frame):
11+
global should_shutdown
12+
should_shutdown.set()
13+
14+
15+
def set_up_logging(log_location):
16+
logging.basicConfig(
17+
level=logging.DEBUG,
18+
format="%(asctime)s %(levelname)-8s %(message)s",
19+
datefmt="%Y-%m-%d %H:%M",
20+
filename=log_location,
21+
filemode="w",
22+
)
23+
24+
25+
def main():
26+
signal.signal(signal.SIGINT, signal_handler)
27+
signal.signal(signal.SIGTERM, signal_handler)
28+
29+
parser = argparse.ArgumentParser(description="Starts the Tandem agent.")
30+
parser.add_argument(
31+
"--host",
32+
default="",
33+
help="The host address to bind to.",
34+
)
35+
parser.add_argument(
36+
"--port",
37+
default=0,
38+
type=int,
39+
help="The port to listen on.",
40+
)
41+
parser.add_argument(
42+
"--log-file",
43+
default="/tmp/tandem-agent.log",
44+
help="The location of the log file.",
45+
)
46+
args = parser.parse_args()
47+
48+
set_up_logging(args.log_file)
49+
50+
# Run the agent until asked to terminate
51+
with TandemAgent(args.host, args.port):
52+
should_shutdown.wait()
53+
54+
55+
if __name__ == "__main__":
56+
main()

plugin/tandem_lib/agent/tandem/__init__.py

Whitespace-only changes.
150 Bytes
Binary file not shown.

plugin/tandem_lib/agent/tandem/agent/__init__.py

Whitespace-only changes.
183 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)