Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

gardening

  • Loading branch information...
commit db9fb2c6a40f683314ad63ac2fa332b2da669f37 1 parent 36b823a
@jankeromnes jankeromnes authored
View
47 Makefile
@@ -1,17 +1,13 @@
-# Makefile: Publish your website and start/stop your server.
+# Makefile: start/stop and manage your tree server.
# Copyright © 2011 Jan Keromnes, Thaddee Tyl. All rights reserved.
-# Code covered by the LGPL license.
+# The following code is covered by the GPLv2 license.
# The output of console.log statements goes in this file when you `make`.
-# Note: when you `make debug`, the output appears on the console.
LOG = node.log
-# The name you gave your main server file.
+# The name of your main server file.
SERVER = app.js
-# The folder where your awesome website is.
-WEB = web
-
ifdef SECURE
PORT ?= 443
SECURE = yes
@@ -40,10 +36,28 @@ stop:
done; \
clean:
+ @# WARNING: This operation deletes server logs.
@echo "clean"
@rm -rf $(LOG)
-init: clean web/ node_modules/bcrypt/
+save:
+ @if [ -e web/.git ]; then mv web/.git .git-bk; fi
+ @cp -r web/* plugs/
+ @cp -r meta plugs/
+ @if [ -e .git-bk ]; then mv .git-bk web/.git; fi
+ @echo 'You may now commit what is in plugs/.'
+
+load:
+ @# WARNING: This operation overwrites files in web/.
+ @if [ -e web/meta ]; then mv web/meta meta-bk; fi
+ @cp -rf plugs/* web/
+ @rm -rf web/meta/
+ @if [ -e meta-bk ]; then mv meta-bk web/meta; fi
+
+test:
+ node lib/test.js
+
+init: web/ node_modules/bcrypt/
web/: plugs/
@if [ -e web ]; then rm -r web; fi # Otherwise cp -r would behave wrong.
@@ -55,24 +69,9 @@ web/: plugs/
plugs/:
@git clone http://github.com/garden/plugs
-load:
- @# This operation is destructive in web.
- @cp -rf plugs/* web/
- @rm -rf web/meta/
-
-save:
- @if [ -e web/.git ]; then mv web/.git .git-bk; fi
- @cp -r web/* plugs
- @cp -r meta plugs/
- @if [ -e .git-bk ]; then mv .git-bk web/.git; fi
- @echo 'You may now commit what is in plugs/.'
-
node_modules/bcrypt/:
@npm install bcrypt
-test:
- node lib/test.js
-
# We mustn't update everything simultaneously – or else debugging
# whatever might break with the update becomes painful.
update:
@@ -113,5 +112,5 @@ me a:
sandwich:
@if [ `id -u` = "0" ] ; then echo "OKAY." ; else echo "What? Make it yourself." ; fi
-.PHONY: restart stop start clean save load test update update-camp update-ot https https.key https.csr https.crt help wtf ? coffee me a sandwich
+.PHONY: start stop clean save load test update update-camp update-ot https help wtf ? coffee me a sandwich
View
18 README.md
@@ -1,11 +1,13 @@
# tree
-The Collaborative Operating System - [thefiletree.com] (https://thefiletree.com)
+> It's multiplayer nodepad!
+
+[thefiletree.com] (https://thefiletree.com)
## Get it
- install [node] (http://nodejs.org)
-- fork or download [tree] (http://github.com/garden/tree)
+- fork or download [tree] (https://github.com/garden/tree)
## Use it
@@ -15,15 +17,15 @@ The Collaborative Operating System - [thefiletree.com] (https://thefiletree.com)
## Contribute
-- open [issues] (http://github.com/garden/tree/issues)
+- open [issues] (https://github.com/garden/tree/issues)
- send [pull requests] (http://help.github.com/send-pull-requests)
-- contact [Thaddee Tyl] (http://github.com/inbox/new/espadrine), [Jan Keromnes] (http://github.com/inbox/new/jankeromnes)
+- contact [Thaddee Tyl] (https://github.com/espadrine), [Jan Keromnes] (https://github.com/jankeromnes)
## Includes
-This project is covered by the GPLv2 license, and contains:
+This project is covered by the GNU General Public License (version 2) and contains code from:
-- [ScoutCamp] (http://espadrine.github.com/ScoutCamp) (LGPL license)
-- [CodeMirror2] (http://codemirror.net) (MIT license)
-- [google-diff-match-patch] (http://code.google.com/p/google-diff-match-patch) (Apache license)
+- [ScoutCamp] (https://github.com/espadrine/sc/) (LGPL license)
+- [CodeMirror2] (https://github.com/marijnh/CodeMirror2) (MIT license)
+- [javascript-operation-transformation] (https://github.com/timjb/javascript-operational-transformation) (MIT license)
View
2  Server.md
@@ -1,4 +1,4 @@
-This is documentation for the `server.js` file. Please edit if you find it
+This is documentation for the `app.js` server file. Please edit if you find it
out-of-date or incomplete.
# Rerouted paths
View
10 TODO.md
@@ -9,12 +9,12 @@ will have to be self-hosted, like the Pencil and the Gateway. This means we
will have figured out a way to know when to send files directly and when to open
them through file tree plugins.
-This was done as of 2012-04-04.
+EDIT: This was done as of 2012-04-04.
-## OT
+## Operational Transformation
-The current Operation Transformation in use (apart from being buggy) uses up a
+The current Operational Transformation in use (apart from being buggy) uses up a
lot of space on the server side (we have to store a copy of the file for each
client editing it, which makes a lot of copies!), and the transformation
operation used (patch) is quite expansive CPU-wise.
@@ -26,8 +26,8 @@ relevant documentation files (probably along `/lib/sync.js`).
[1] http://delivery.acm.org/10.1145/220000/215706/p111-nichols.pdf
-This was done as of 2012-04-18. Special thanks to
-[Tim Baumann](https://github.com/timjb/javascript-operational-transformation).
+EDIT: This was done as of 2012-04-18. Special thanks to
+[Tim Baumann] (https://github.com/timjb/javascript-operational-transformation).
## Security
View
2  app.js
@@ -1,4 +1,4 @@
-/* server.js: run this with Node.js in the publish/ folder to start your server.
+/* app.js: run this with node to start your tree server.
* Copyright © 2011 Jan Keromnes, Thaddee Tyl. All rights reserved.
* The following code is covered by the GPLv2 license. */
View
6 package.json
@@ -1,12 +1,12 @@
{
"author": "TheFileTree <warden@thefiletree.com> (https://thefiletree.com/)",
"name": "filetree",
- "description": "Web-based Collaborative File System; a multiplayer notepad!",
- "version": "12.05.01",
+ "description": "Web-based collaborative file system; a multiplayer notepad!",
+ "version": "12.06.19",
"homepage": "https://thefiletree.com",
"repository": {
"type": "git",
- "url": "http://github.com/garden/tree"
+ "url": "https://github.com/garden/tree"
},
"scripts": {
"test": "make test"
Please sign in to comment.
Something went wrong with that request. Please try again.