Fix JsonModelPlugin setting the name of the resulting RbxInstance

Add error context to output for JsonModelPlugin
Fix broken file watcher implementation
2026-04-20 20:55:50 +00:00 · 2018-01-09 16:40:39 -08:00 · 2018-01-09 11:31:48 -08:00 · 2018-01-08 12:33:36 -08:00 · 2018-01-08 12:33:33 -08:00 · 2018-01-05 13:07:09 -08:00
46 changed files with 1296 additions and 1579 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,11 +4,6 @@ root = true
 end_of_line = lf
 charset = utf-8

-[*.lua]
-indent_style = tab
-trim_trailing_whitespace = true
-insert_final_newline = true
-
 [*.rs]
 indent_style = space
 indent_size = 4
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,5 @@
+language: rust
+
+rust:
+  - stable
+  - beta
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,7 +1,33 @@
 # Rojo Change Log

-## Current Master
-* *No changes*
+## Current Master (0.4.0)
+* Began protocol version 1, which shifts more responsibility onto the server
+	* This is a **major breaking** change!
+	* The server now has a content of 'filter plugins', which transform data at various stages in the pipeline
+	* The server now exposes Roblox instance objects instead of file contents, which lines up with how `rojo pack` will work, and paves the way for more robust syncing.
+
+## 0.3.2
+* Fixed `rojo serve` failing to correctly construct an absolute root path when passed as an argument
+* Fixed intense CPU usage when running `rojo serve`
+
+## 0.3.1
+* Improved error reporting when invalid JSON is found in a `rojo.json` project
+	* These messages are passed on from Serde
+
+## 0.3.0
+* Factored out the plugin into a separate repository
+* Fixed server when using a file as a partition
+	* Previously, trailing slashes were put on the end of a partition even if the read request was an empty string. This broke file reading on Windows when a partition pointed to a file instead of a directory!
+* Started running automatic tests on Travis CI (#9)
+
+## 0.2.3
+* Plugin only release
+* Tightened `init` file rules to only match script files
+	* Previously, Rojo would sometimes pick up the wrong file when syncing
+
+## 0.2.2
+* Plugin only release
+* Fixed broken reconciliation behavior with `init` files

 ## 0.2.1
 * Plugin only release
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,16 +1,3 @@
-[root]
-name = "rojo"
-version = "0.2.0"
-dependencies = [
- "clap 2.28.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "notify 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "rouille 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "0.5.3"
@@ -19,6 +6,14 @@ dependencies = [
 "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "aho-corasick"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "ansi_term"
 version = "0.10.2"
@@ -31,13 +26,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "atty"
-version = "0.2.3"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -61,7 +55,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -70,7 +64,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "brotli-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -98,8 +92,8 @@ name = "chrono"
 version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -109,11 +103,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "clap"
-version = "2.28.0"
+version = "2.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "atty 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -188,7 +182,7 @@ name = "env_logger"
 version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -198,8 +192,8 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -207,7 +201,7 @@ name = "flate2"
 version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -218,7 +212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "fsevent-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -226,24 +220,22 @@ name = "fsevent-sys"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "fuchsia-zircon"
-version = "0.2.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "fuchsia-zircon-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "fuchsia-zircon-sys"
-version = "0.2.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]

 [[package]]
 name = "gcc"
@@ -265,7 +257,7 @@ name = "inotify"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -282,15 +274,31 @@ dependencies = [
 "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "lazy_static"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "libc"
-version = "0.2.33"
+version = "0.2.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "log"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "log"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]

 [[package]]
 name = "matches"
@@ -302,7 +310,15 @@ name = "memchr"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "memchr"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -310,7 +326,7 @@ name = "mime"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -330,7 +346,7 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cc 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -339,13 +355,13 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "miow 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
 "nix 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -367,11 +383,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "buf_redux 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "mime 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "mime_guess 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -382,7 +398,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -393,7 +409,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -407,7 +423,7 @@ dependencies = [
 "fsevent-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "inotify 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "walkdir 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -415,12 +431,12 @@ dependencies = [

 [[package]]
 name = "num"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -428,7 +444,7 @@ name = "num-integer"
 version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -437,12 +453,12 @@ version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "num-traits"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@@ -473,7 +489,7 @@ version = "0.7.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -491,16 +507,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "rand"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "fuchsia-zircon 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "redox_syscall"
-version = "0.1.32"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@@ -508,7 +524,7 @@ name = "redox_termios"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "redox_syscall 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -523,11 +539,43 @@ dependencies = [
 "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "regex"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "regex-syntax"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "regex-syntax"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rojo"
+version = "0.4.0"
+dependencies = [
+ "clap 2.29.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "notify 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rouille 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rouille"
 version = "1.0.3"
@@ -538,11 +586,11 @@ dependencies = [
 "filetime 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "flate2 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "multipart 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
 "sha1 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "term 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "tiny_http 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -554,11 +602,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "same-file"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -566,27 +613,27 @@ name = "serde"
 version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "serde"
-version = "1.0.21"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "serde_derive"
-version = "1.0.21"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive_internals 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive_internals 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "serde_derive_internals"
-version = "0.17.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -595,13 +642,13 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.6"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -647,7 +694,7 @@ name = "tempdir"
 version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -664,8 +711,8 @@ name = "termion"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -683,7 +730,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -695,14 +742,22 @@ dependencies = [
 ]

 [[package]]
-name = "time"
-version = "0.1.38"
+name = "thread_local"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "time"
+version = "0.1.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -714,7 +769,7 @@ dependencies = [
 "chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)",
 "chunked_transfer 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 0.2.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -742,6 +797,14 @@ name = "unicode-xid"
 version = "0.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "unreachable"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "url"
 version = "0.2.38"
@@ -767,12 +830,17 @@ name = "utf8-ranges"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "utf8-ranges"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "uuid"
 version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -781,12 +849,17 @@ name = "vec_map"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "void"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "walkdir"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "same-file 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "same-file 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -794,11 +867,30 @@ name = "winapi"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "winapi"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "winapi-build"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "ws2_32-sys"
 version = "0.2.1"
@@ -810,9 +902,10 @@ dependencies = [

 [metadata]
 "checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
+"checksum aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4"
 "checksum ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6b3568b48b7cefa6b8ce125f9bb4989e52fbcc29ebea88df04cc7c5f12f70455"
 "checksum ascii 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae7d751998c189c1d4468cf0a39bb2eae052a9c58d50ebb3b9591ee3813ad50"
-"checksum atty 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "21e50800ec991574876040fff8ee46b136a53e985286fbe6a3bdfe6421b78860"
+"checksum atty 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8352656fd42c30a0c3c89d26dea01e3b77c0ab2af18230835c15e2e13cd51859"
 "checksum bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dead7461c1127cf637931a1e50934eb6eee8bff2f74433ac7909e9afcee04a3"
 "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
 "checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf"
@@ -824,7 +917,7 @@ dependencies = [
 "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
 "checksum chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9213f7cd7c27e95c2b57c49f0e69b1ea65b27138da84a170133fd21b07659c00"
 "checksum chunked_transfer 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87"
-"checksum clap 2.28.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dc34bf7d5d66268b466b9852bca925ec1d2650654dab4da081e63fd230145c2e"
+"checksum clap 2.29.0 (registry+https://github.com/rust-lang/crates.io-index)" = "110d43e343eb29f4f51c1db31beb879d546db27998577e5715270a54bcf41d3f"
 "checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
 "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
 "checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
@@ -838,17 +931,20 @@ dependencies = [
 "checksum flate2 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)" = "e6234dd4468ae5d1e2dbb06fe2b058696fdc50a339c68a393aefbf00bc81e423"
 "checksum fsevent 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c4bbbf71584aeed076100b5665ac14e3d85eeb31fdbb45fbd41ef9a682b5ec05"
 "checksum fsevent-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a772d36c338d07a032d5375a36f15f9a7043bf0cb8ce7cee658e037c6032874"
-"checksum fuchsia-zircon 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f6c0581a4e363262e52b87f59ee2afe3415361c6ec35e665924eb08afe8ff159"
-"checksum fuchsia-zircon-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "43f3795b4bae048dc6123a6b972cadde2e676f9ded08aef6bb77f5f157684a82"
+"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
+"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 "checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb"
 "checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d"
 "checksum inotify 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "887fcc180136e77a85e6a6128579a719027b1bab9b1c38ea4444244fe262c20c"
 "checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-"checksum libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "5ba3df4dcb460b9dfbd070d41c94c19209620c191b0340b929ce748a2bcd42d2"
-"checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b"
+"checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
+"checksum libc 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)" = "96264e9b293e95d25bfcbbf8a88ffd1aedc85b754eba8b7d78012f638ba220eb"
+"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
+"checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2"
 "checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376"
 "checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
+"checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d"
 "checksum mime 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ec0c2f4d901bf1d4a2192a40b4b570ae3b19c51243e549defc1de741940aa787"
 "checksum mime_guess 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "422acd80644209a8c8c66a20514840d8c092eb1eab2898ca7c548cc1d64c8998"
 "checksum miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "609ce024854aeb19a0ef7567d348aaa5a746b32fb72e336df7fcc16869d7e2b4"
@@ -858,29 +954,31 @@ dependencies = [
 "checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09"
 "checksum nix 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bfb3ddedaa14746434a02041940495bf11325c22f6d36125d3bdd56090d50a79"
 "checksum notify 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5c3812da3098f210a0bb440f9c008471a031aa4c1de07a264fdd75456c95a4eb"
-"checksum num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "a311b77ebdc5dd4cf6449d81e4135d9f0e3b153839ac90e648a8ef538f923525"
+"checksum num 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "cc4083e14b542ea3eb9b5f33ff48bd373a92d78687e74f4cc0a30caeb754f0ca"
 "checksum num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "d1452e8b06e448a07f0e6ebb0bb1d92b8890eea63288c0b627331d53514d0fba"
 "checksum num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "7485fcc84f85b4ecd0ea527b14189281cf27d60e583ae65ebc9c088b13dffe01"
-"checksum num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "99843c856d68d8b4313b03a17e33c4bb42ae8f6610ea81b28abe076ac721b9b0"
+"checksum num-traits 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "cacfcab5eb48250ee7d0c7896b51a2c5eec99c1feea5f32025635f5ae4b00070"
 "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
 "checksum phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "cb325642290f28ee14d8c6201159949a872f220c62af6e110a56ea914fbe42fc"
 "checksum phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d62594c0bb54c464f633175d502038177e90309daf2e0158be42ed5f023ce88f"
 "checksum phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6b07ffcc532ccc85e3afc45865469bf5d9e4ef5bfcf9622e3cfe80c2d275ec03"
 "checksum phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "07e24b0ca9643bdecd0632f2b3da6b1b89bbb0030e0b992afc1113b23a7bc2f2"
 "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
-"checksum rand 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)" = "6475140dfd8655aeb72e1fd4b7a1cc1c202be65d71669476e392fe62532b9edd"
-"checksum redox_syscall 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "ab105df655884ede59d45b7070c8a65002d921461ee813a024558ca16030eea0"
+"checksum rand 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)" = "9e7944d95d25ace8f377da3ac7068ce517e4c646754c43a1b1849177bbf72e59"
+"checksum redox_syscall 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "df1a5c588807af3b0cbbfa2f1358f2d5ec6ad546858c1ccd30dfbb127021706b"
 "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
 "checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
+"checksum regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "744554e01ccbd98fff8c457c3b092cd67af62a555a43bfe97ae8a0451f7799fa"
 "checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
+"checksum regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e"
 "checksum rouille 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d6415f261a8775bef50e9fcfb14ed73209ce637f753f9d1c8c6122559e559001"
 "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
-"checksum same-file 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70a18720d745fb9ca6a041b37cb36d0b21066006b6cff8b5b360142d4b81fb60"
+"checksum same-file 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3257af0472da4b8b8902102a57bafffd9991f0f43772a8af6153d597e6e4ae2"
 "checksum serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)" = "c97b18e9e53de541f11e497357d6c5eaeb39f0cb9c8734e274abe4935f6991fa"
-"checksum serde 1.0.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6eda663e865517ee783b0891a3f6eb3a253e0b0dabb46418969ee9635beadd9e"
-"checksum serde_derive 1.0.21 (registry+https://github.com/rust-lang/crates.io-index)" = "652bc323d694dc925829725ec6c890156d8e70ae5202919869cb00fe2eff3788"
-"checksum serde_derive_internals 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "32f1926285523b2db55df263d2aa4eb69ddcfa7a7eade6430323637866b513ab"
-"checksum serde_json 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "e4586746d1974a030c48919731ecffd0ed28d0c40749d0d18d43b3a7d6c9b20e"
+"checksum serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)" = "db99f3919e20faa51bb2996057f5031d8685019b5a06139b1ce761da671b8526"
+"checksum serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)" = "f4ba7591cfe93755e89eeecdbcc668885624829b020050e6aec99c2a03bd3fd0"
+"checksum serde_derive_internals 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e03f1c9530c3fb0a0a5c9b826bdd9246a5921ae995d75f512ac917fc4dd55b5"
+"checksum serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c9db7266c7d63a4c4b7fe8719656ccdd51acf1bed6124b174f933b009fb10bcb"
 "checksum sha1 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cc30b1e1e8c40c121ca33b86c23308a090d19974ef001b4bf6e61fd1a0fb095c"
 "checksum siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537"
 "checksum slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d807fd58c4181bbabed77cb3b891ba9748241a552bcc5be698faaebefc54f46e"
@@ -893,18 +991,25 @@ dependencies = [
 "checksum textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0b59b6b4b44d867f1370ef1bd91bfb262bf07bf0ae65c202ea2fbc16153b693"
 "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
 "checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
-"checksum time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d788d3aa77bc0ef3e9621256885555368b47bd495c13dd2e7413c89f845520"
+"checksum thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "279ef31c19ededf577bfd12dfae728040a21f635b06a24cd670ff510edd38963"
+"checksum time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "a15375f1df02096fb3317256ce2cee6a1f42fc84ea5ad5fc8c421cfe40c73098"
 "checksum tiny_http 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "016f040cfc9b5be610de3619eaaa57017fa0b0b678187327bde75fc146e2a41f"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f"
 "checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f"
 "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
+"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
 "checksum url 0.2.38 (registry+https://github.com/rust-lang/crates.io-index)" = "cbaa8377a162d88e7d15db0cf110c8523453edcbc5bc66d2b6fffccffa34a068"
 "checksum url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa35e768d4daf1d85733418a49fb42e10d7f633e394fccab4ab7aba897053fe2"
 "checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
+"checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
 "checksum uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "78c590b5bd79ed10aad8fb75f078a59d8db445af6c743e55c4a53227fc01c13f"
 "checksum vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c"
+"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum walkdir 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40b6d201f4f8998a837196b6de9c73e35af14c992cbb92c4ab641d2c2dce52de"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
+"checksum winapi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b09fb3b6f248ea4cd42c9a65113a847d612e17505d6ebd1f7357ad68a8bf8693"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
+"checksum winapi-i686-pc-windows-gnu 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ec6667f60c23eca65c561e63a13d81b44234c2e38a6b6c959025ee907ec614cc"
+"checksum winapi-x86_64-pc-windows-gnu 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "98f12c52b2630cd05d2c3ffd8e008f7f48252c042b4871c72aed9dc733b96668"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rojo"
-version = "0.2.0"
+version = "0.4.0"
 authors = ["Lucien Greathouse <me@lpghatguy.com>"]
 description = "A tool to create robust Roblox projects"
 license = "MIT"
@@ -18,3 +18,5 @@ serde_derive = "1.0"
 serde_json = "1.0"
 notify = "4.0.0"
 rand = "0.3"
+regex = "0.2"
+lazy_static = "1.0"
--- a/DESIGN.md
+++ b/DESIGN.md
@@ -0,0 +1,39 @@
+# Rojo Design - Protocol Version 1
+This is a super rough draft that I'm trying to use to lay out some of my thoughts.
+
+## API
+
+### POST `/read`
+Accepts a `Vec<Route>` of items to read.
+
+Returns `Vec<Option<RbxInstance>>`, in the same order as the request.
+
+### POST `/write`
+Accepts a `Vec<{ Route, RbxInstance }>` of items to write.
+
+I imagine that the `Name` attribute of the top-level `RbxInstance` would be ignored in favor of the route name?
+
+## CLI
+The `rojo serve` command uses three major components:
+* A Virtual Filesystem (VFS), which exposes the filesystem as `VfsItem` objects
+* A VFS watcher, which tracks changes to the filesystem and logs them
+* An HTTP API, which exposes an interface to the Roblox Studio plugin
+
+### Transform Plugins
+Transform plugins (or filter plugins?) can interject in three places:
+* Transform a `VfsItem` that's being read into an `RbxInstance` in the VFS
+* Transform an `RbxInstance` that's being written into a `VfsItem` in the VFS
+* Transform a file change into paths that need to be updated in the VFS watcher
+
+The plan is to have several built-in plugins that can be rearranged/configured in project settings:
+
+* Base plugin
+	* Transforms all unhandled files to/from StringValue objects
+* Script plugin
+	* Transforms `*.lua` files to their appropriate file types
+* JSON/rbxmx/rbxlx model plugin
+* External binary plugin
+	* User passes a binary name (like `moonc`) that modifies file contents
+
+## Roblox Studio Plugin
+With the protocol version 1 change, the Roblox Studio plugin got a lot simpler. Notably, the plugin doesn't need to be aware of anything about the filesystem's semantics, which is super handy.
--- a/README.md
+++ b/README.md
@@ -1,55 +1,43 @@
 <h1 align="center">Rojo</h1>
 <div align="center">
-	<a href="https://travis-ci.org/LPGhatguy/Rojo">
-		<img src="https://api.travis-ci.org/LPGhatguy/Rojo.svg?branch=master" alt="Travis-CI Build Status" />
-	</a>
-	<a href="#">
-		<img src="https://img.shields.io/badge/docs-soon-red.svg" alt="Documentation" />
+	<a href="https://travis-ci.org/LPGhatguy/rojo">
+		<img src="https://api.travis-ci.org/LPGhatguy/rojo.svg?branch=master" alt="Travis-CI Build Status" />
 	</a>
 </div>

 <div>&nbsp;</div>

-**EARLY DEVELOPMENT, USE WITH CARE**
+Rojo is a flexible multi-tool designed for creating robust Roblox projects. It's in early development, but is still useful for many projects.

-Rojo is a flexible multi-tool designed for creating robust Roblox projects.
+It's designed for power users who want to use the **best tools available** for building games, libraries, and plugins.

-It's designed for power users who want to use the best tools available for building games, libraries, and plugins.
+This is the main Rojo repository, containing the binary server component. For the source for the Roblox plugin, [see the rojo-plugin repository](https://github.com/LPGhatguy/rojo-plugin).

-It has a number of desirable features *right now*:
+The master branches of both respositories should always pass all tests and be functional, but are not suitable for production use!

-* Work from the filesystem, in your favorite editor
+## Features
+
+Rojo has a number of desirable features *right now*:
+
+* Work on scripts from the filesystem, in your favorite editor
 * Version your place, library, or plugin using Git or another VCS

 Soon, Rojo will be able to:

+* Sync Roblox objects (including models) bi-directionally between the filesystem and Roblox Studio
 * Create installation scripts for libraries to be used in standalone places
 	* Similar to [rbxpacker](https://github.com/LPGhatguy/rbxpacker), another one of my projects
 * Add strongly-versioned dependencies to your project

 ## Installation
 Rojo has two components:
-* The binary, written in Rust
-* The [Roblox Studio plugin](https://www.roblox.com/library/1211549683/Rojo-v0-0-0), written in Lua
+* The command line tool, written in Rust
+* The [Roblox Studio plugin](https://www.roblox.com/library/1211549683/Rojo), written in Lua

-To install the binary, there are two options:
-* Cargo, which requires you to have Rust installed
-* Pre-built binaries from the [the GitHub releases page](https://github.com/LPGhatguy/rojo/releases)
-
-### Cargo (Recommended)
-Make sure you have [Rust 1.21 or newer](https://www.rust-lang.org/) installed.
-
-Install Rojo using:
-
-```sh
-cargo install rojo
-
-# Installed!
-rojo help
-```
-
-### Pre-Built (Windows only)
-Download the latest binary from [the GitHub releases page](https://github.com/LPGhatguy/rojo/releases). Put it somewhere you can access it from a terminal!
+To install the command line tool, there are two options:
+* Cargo, if you have Rust installed
+	* Use `cargo install rojo` -- Rojo will be available with the `rojo` command
+* Download a pre-built Windows binary from [the GitHub releases page](https://github.com/LPGhatguy/rojo/releases)

 ## Usage
 For more help, use `rojo help`.
@@ -66,8 +54,99 @@ rojo init

 Rojo will create an empty project in the directory.

+The default project looks like this:
+
+```json
+{
+  "name": "my-new-project",
+  "servePort": 8000,
+  "partitions": {}
+}
+```
+
+### Start Dev Server
+To create a server that allows the Rojo Dev Plugin to access your project, use:
+
+```sh
+rojo serve
+```
+
+The tool will tell you whether it found an existing project. You should then be able to connect and use the project from within Roblox Studio!
+
 ### Migrating an Existing Roblox Project
-Coming soon!
+**Coming soon!**
+
+### Syncing into Roblox
+In order to sync code into Roblox, you'll need to add one or more "partitions" to your configuration. A partition tells Rojo how to map directories to Roblox objects.
+
+Each entry in the partitions table has a unique name, a filesystem path, and the full name of the Roblox object to sync into.
+
+For example, if you want to map your `src` directory to an object named `My Cool Game` in `ReplicatedStorage`, you could use this configuration:
+
+```json
+{
+  "name": "rojo",
+  "servePort": 8000,
+  "partitions": {
+    "game": {
+      "path": "src",
+      "target": "ReplicatedStorage.My Cool Game"
+    }
+  }
+}
+```
+
+The `path` parameter is relative to the project file.
+
+The `target` starts at `game` and crawls down the tree. If any objects don't exist along the way, they'll be created as `Folder` instances.
+
+Run `rojo serve` in the directory containing this project, then press the "Sync In" or "Toggle Polling" buttons in the Roblox Studio plugin to move code into your game.
+
+### Sync Details
+The structure of files and folders on the filesystem are preserved when syncing into game.
+
+Creation of Roblox instances follows a simple set of rules. The first rule that matches the file name is chosen:
+
+| File Name      | Instance Type  | Notes                                     |
+| -------------- | -------------- | ----------------------------------------- |
+| `*.server.lua` | `Script`       | `Source` will contain the file's contents |
+| `*.client.lua` | `LocalScript`  | `Source` will contain the file's contents |
+| `*.lua`        | `ModuleScript` | `Source` will contain the file's contents |
+| `*`            | `StringValue`  | `Value` will contain the file's contents  |
+
+Any folders on the filesystem will turn into `Folder` objects unless they contain a file named `init.lua`, `init.server.lua`, or `init.client.lua`. Following the convention of Lua, those objects will instead be whatever the `init` file would turn into.
+
+For example, this file tree:
+
+* my-game
+	* init.client.lua
+	* foo.lua
+
+Will turn into this tree in Roblox:
+
+* `my-game` (`LocalScript` with source from `my-game/init.client.lua`)
+	* `foo` (`ModuleScript` with source from `my-game/foo.lua`)
+
+## Inspiration
+There are lots of other tools that sync scripts into Roblox, or otherwise work to improve the development flow outside of Roblox Studio.
+
+Here are a few, if you're looking for alternatives or supplements to Rojo:
+* [Studio Bridge by Vocksel](https://github.com/vocksel/studio-bridge)
+* [RbxRefresh by Osyris](https://github.com/osyrisrblx/RbxRefresh)
+* [RbxSync by evaera](https://github.com/evaera/RbxSync)
+* [CodeSync](https://github.com/MemoryPenguin/CodeSync) and [rbx-exteditor](https://github.com/MemoryPenguin/rbx-exteditor) by [MemoryPenguin](https://github.com/MemoryPenguin)
+* [rbxmk by Anaminus](https://github.com/anaminus/rbxmk)
+
+I also have a couple tools that Rojo intends to replace:
+* [rbxfs](https://github.com/LPGhatguy/rbxfs), which has been deprecated by Rojo
+* [rbxpacker](https://github.com/LPGhatguy/rbxpacker), which is still useful
+
+## Contributing
+Pull requests are welcome!
+
+The `master` branch of both repositories have tests running on Travis for every commit and pull request. The test suite on `master` should always pass!
+
+The Rojo and Rojo Plugin repositories should stay in sync with eachother, so that the current `master` of each repository can be used together.

 ## License
 Rojo is available under the terms of the MIT license. See [LICENSE.md](LICENSE.md) for details.
--- a/plugin/.luacheckrc
+++ b/plugin/.luacheckrc
@@ -1,56 +0,0 @@
-stds.roblox = {
-	read_globals = {
-		game = {
-			other_fields = true,
-		},
-
-		-- Roblox globals
-		"script",
-
-		-- Extra functions
-		"tick", "warn", "spawn",
-		"wait", "settings",
-
-		-- Types
-		"Vector2", "Vector3",
-		"Color3",
-		"UDim", "UDim2",
-		"Rect",
-		"CFrame",
-		"Enum",
-		"Instance",
-	}
-}
-
-stds.plugin = {
-	read_globals = {
-		"plugin",
-	}
-}
-
-stds.testez = {
-	read_globals = {
-		"describe",
-		"it", "itFOCUS", "itSKIP",
-		"FOCUS", "SKIP", "HACK_NO_XPCALL",
-		"expect",
-	}
-}
-
-ignore = {
-	"212", -- unused arguments
-	"421", -- shadowing local variable
-	"422", -- shadowing argument
-	"431", -- shadowing upvalue
-	"432", -- shadowing upvalue argument
-}
-
-std = "lua51+roblox"
-
-files["**/*.server.lua"] = {
-	std = "+plugin",
-}
-
-files["**/*-spec.lua"] = {
-	std = "+testez",
-}
--- a/plugin/src/Config.lua
+++ b/plugin/src/Config.lua
@@ -1,4 +0,0 @@
-return {
-	pollingRate = 0.3,
-	version = "0.2.1",
-}
--- a/plugin/src/Http.lua
+++ b/plugin/src/Http.lua
@@ -1,67 +0,0 @@
-local HttpService = game:GetService("HttpService")
-
-local HTTP_DEBUG = false
-
-local Promise = require(script.Parent.Promise)
-local HttpError = require(script.Parent.HttpError)
-local HttpResponse = require(script.Parent.HttpResponse)
-
-local function dprint(...)
-	if HTTP_DEBUG then
-		print(...)
-	end
-end
-
-local Http = {}
-Http.__index = Http
-
-function Http.new(baseUrl)
-	assert(type(baseUrl) == "string", "Http.new needs a baseUrl!")
-
-	local http = {
-		baseUrl = baseUrl
-	}
-
-	setmetatable(http, Http)
-
-	return http
-end
-
-function Http:get(endpoint)
-	dprint("\nGET", endpoint)
-	return Promise.new(function(resolve, reject)
-		spawn(function()
-			local ok, result = pcall(function()
-				return HttpService:GetAsync(self.baseUrl .. endpoint, true)
-			end)
-
-			if ok then
-				dprint("\t", result, "\n")
-				resolve(HttpResponse.new(result))
-			else
-				reject(HttpError.fromErrorString(result))
-			end
-		end)
-	end)
-end
-
-function Http:post(endpoint, body)
-	dprint("\nPOST", endpoint)
-	dprint(body)
-	return Promise.new(function(resolve, reject)
-		spawn(function()
-			local ok, result = pcall(function()
-				return HttpService:PostAsync(self.baseUrl .. endpoint, body)
-			end)
-
-			if ok then
-				dprint("\t", result, "\n")
-				resolve(HttpResponse.new(result))
-			else
-				reject(HttpError.fromErrorString(result))
-			end
-		end)
-	end)
-end
-
-return Http
--- a/plugin/src/HttpError.lua
+++ b/plugin/src/HttpError.lua
@@ -1,57 +0,0 @@
-local HttpError = {}
-HttpError.__index = HttpError
-
-HttpError.Error = {
-	HttpNotEnabled = {
-		message = "Rojo requires HTTP access, which is not enabled.\n" ..
-			"Check your game settings, located in the 'Home' tab of Studio.",
-	},
-	ConnectFailed = {
-		message = "Rojo plugin couldn't connect to the Rojo server.\n" ..
-			"Make sure the server is running -- use 'Rojo serve' to run it!",
-	},
-	Unknown = {
-		message = "Rojo encountered an unknown error: {{message}}",
-	},
-}
-
-function HttpError.new(type, extraMessage)
-	extraMessage = extraMessage or ""
-	local message = type.message:gsub("{{message}}", extraMessage)
-
-	local err = {
-		type = type,
-		message = message,
-	}
-
-	setmetatable(err, HttpError)
-
-	return err
-end
-
-function HttpError:__tostring()
-	return self.message
-end
-
--[[
-	This method shouldn't have to exist. Ugh.
-]]
-function HttpError.fromErrorString(err)
-	err = err:lower()
-
-	if err:find("^http requests are not enabled") then
-		return HttpError.new(HttpError.Error.HttpNotEnabled)
-	end
-
-	if err:find("^curl error") then
-		return HttpError.new(HttpError.Error.ConnectFailed)
-	end
-
-	return HttpError.new(HttpError.Error.Unknown, err)
-end
-
-function HttpError:report()
-	warn(self.message)
-end
-
-return HttpError
--- a/plugin/src/HttpResponse.lua
+++ b/plugin/src/HttpResponse.lua
@@ -1,20 +0,0 @@
-local HttpService = game:GetService("HttpService")
-
-local HttpResponse = {}
-HttpResponse.__index = HttpResponse
-
-function HttpResponse.new(body)
-	local response = {
-		body = body,
-	}
-
-	setmetatable(response, HttpResponse)
-
-	return response
-end
-
-function HttpResponse:json()
-	return HttpService:JSONDecode(self.body)
-end
-
-return HttpResponse
--- a/plugin/src/Main.server.lua
+++ b/plugin/src/Main.server.lua
@@ -1,40 +0,0 @@
-if not plugin then
-	return
-end
-
-local Plugin = require(script.Parent.Plugin)
-local Config = require(script.Parent.Config)
-
-local function main()
-	local pluginInstance = Plugin.new()
-
-	local toolbar = plugin:CreateToolbar("Rojo Plugin v" .. Config.version)
-
-	toolbar:CreateButton("Test Connection", "Connect to Rojo Server", "")
-		.Click:Connect(function()
-			pluginInstance:connect()
-				:catch(function(err)
-					warn(err)
-				end)
-		end)
-
-	toolbar:CreateButton("Sync In", "Sync into Roblox Studio", "")
-		.Click:Connect(function()
-			pluginInstance:syncIn()
-				:catch(function(err)
-					warn(err)
-				end)
-		end)
-
-	toolbar:CreateButton("Toggle Polling", "Poll server for changes", "")
-		.Click:Connect(function()
-			spawn(function()
-				pluginInstance:togglePolling()
-					:catch(function(err)
-						warn(err)
-					end)
-			end)
-		end)
-end
-
-main()
--- a/plugin/src/Plugin.lua
+++ b/plugin/src/Plugin.lua
@@ -1,178 +0,0 @@
-local Config = require(script.Parent.Config)
-local Http = require(script.Parent.Http)
-local Server = require(script.Parent.Server)
-local Promise = require(script.Parent.Promise)
-local Reconciler = require(script.Parent.Reconciler)
-
-local function collectMatch(source, pattern)
-	local result = {}
-
-	for match in source:gmatch(pattern) do
-		table.insert(result, match)
-	end
-
-	return result
-end
-
-local Plugin = {}
-Plugin.__index = Plugin
-
-function Plugin.new()
-	local address = "localhost"
-	local port = 8000
-
-	local remote = ("http://%s:%d"):format(address, port)
-
-	local foop = {
-		_http = Http.new(remote),
-		_server = nil,
-		_polling = false,
-	}
-
-	setmetatable(foop, Plugin)
-
-	do
-		local screenGui = Instance.new("ScreenGui")
-		screenGui.Name = "Rojo UI"
-		screenGui.Parent = game.CoreGui
-		screenGui.DisplayOrder = -1
-		screenGui.Enabled = false
-
-		local label = Instance.new("TextLabel")
-		label.Font = Enum.Font.SourceSans
-		label.TextSize = 20
-		label.Text = "Rojo polling..."
-		label.BackgroundColor3 = Color3.fromRGB(31, 31, 31)
-		label.BackgroundTransparency = 0.5
-		label.BorderSizePixel = 0
-		label.TextColor3 = Color3.new(1, 1, 1)
-		label.Size = UDim2.new(0, 120, 0, 28)
-		label.Position = UDim2.new(0, 0, 0, 0)
-		label.Parent = screenGui
-
-		foop._label = screenGui
-	end
-
-	return foop
-end
-
-function Plugin:server()
-	if not self._server then
-		self._server = Server.connect(self._http)
-			:catch(function(err)
-				self._server = nil
-				return Promise.reject(err)
-			end)
-	end
-
-	return self._server
-end
-
-function Plugin:connect()
-	print("Testing connection...")
-
-	return self:server()
-		:andThen(function(server)
-			return server:getInfo()
-		end)
-		:andThen(function(result)
-			print("Server found!")
-			print("Protocol version:", result.protocolVersion)
-			print("Server version:", result.serverVersion)
-		end)
-end
-
-function Plugin:togglePolling()
-	if self._polling then
-		self:stopPolling()
-
-		return Promise.resolve(nil)
-	else
-		return self:startPolling()
-	end
-end
-
-function Plugin:stopPolling()
-	if not self._polling then
-		return
-	end
-
-	print("Stopped polling.")
-
-	self._polling = false
-	self._label.Enabled = false
-end
-
-function Plugin:_pull(server, project, routes)
-	local items = server:read(routes):await()
-
-	for index = 1, #routes do
-		local route = routes[index]
-		local partitionName = route[1]
-		local partition = project.partitions[partitionName]
-		local item = items[index]
-
-		local fullRoute = collectMatch(partition.target, "[^.]+")
-		for i = 2, #route do
-			table.insert(fullRoute, routes[index][i])
-		end
-
-		Reconciler.reconcileRoute(fullRoute, item)
-	end
-end
-
-function Plugin:startPolling()
-	if self._polling then
-		return
-	end
-
-	print("Starting to poll...")
-
-	self._polling = true
-	self._label.Enabled = true
-
-	return self:server()
-		:andThen(function(server)
-			self:syncIn():await()
-
-			local project = server:getInfo():await().project
-
-			while self._polling do
-				local changes = server:getChanges():await()
-
-				local routes = {}
-
-				for _, change in ipairs(changes) do
-					table.insert(routes, change.route)
-				end
-
-				self:_pull(server, project, routes)
-
-				wait(Config.pollingRate)
-			end
-		end)
-		:catch(function()
-			self:stopPolling()
-		end)
-end
-
-function Plugin:syncIn()
-	print("Syncing from server...")
-
-	return self:server()
-		:andThen(function(server)
-			local project = server:getInfo():await().project
-
-			local routes = {}
-
-			for name in pairs(project.partitions) do
-				table.insert(routes, {name})
-			end
-
-			self:_pull(server, project, routes)
-
-			print("Sync successful!")
-		end)
-end
-
-return Plugin
--- a/plugin/src/Promise-spec.lua
+++ b/plugin/src/Promise-spec.lua
@@ -1,70 +0,0 @@
-return function()
-	local Promise = require(script.Parent.Promise)
-
-	describe("Promise.new", function()
-		it("should instantiate with a callback", function()
-			local promise = Promise.new(function() end)
-
-			expect(promise).to.be.ok()
-		end)
-
-		it("should invoke the given callback with resolve and reject", function()
-			local callCount = 0
-			local resolveArg
-			local rejectArg
-
-			local promise = Promise.new(function(resolve, reject)
-				callCount = callCount + 1
-				resolveArg = resolve
-				rejectArg = reject
-			end)
-
-			expect(promise).to.be.ok()
-
-			expect(callCount).to.equal(1)
-			expect(resolveArg).to.be.a("function")
-			expect(rejectArg).to.be.a("function")
-			expect(promise._status).to.equal(Promise.Status.Started)
-		end)
-
-		it("should resolve promises on resolve()", function()
-			local callCount = 0
-
-			local promise = Promise.new(function(resolve)
-				callCount = callCount + 1
-				resolve()
-			end)
-
-			expect(promise).to.be.ok()
-			expect(callCount).to.equal(1)
-			expect(promise._status).to.equal(Promise.Status.Resolved)
-		end)
-
-		it("should reject promises on reject()", function()
-			local callCount = 0
-
-			local promise = Promise.new(function(resolve, reject)
-				callCount = callCount + 1
-				reject()
-			end)
-
-			expect(promise).to.be.ok()
-			expect(callCount).to.equal(1)
-			expect(promise._status).to.equal(Promise.Status.Rejected)
-		end)
-
-		it("should reject on error in callback", function()
-			local callCount = 0
-
-			local promise = Promise.new(function()
-				callCount = callCount + 1
-				error("hahah")
-			end)
-
-			expect(promise).to.be.ok()
-			expect(callCount).to.equal(1)
-			expect(promise._status).to.equal(Promise.Status.Rejected)
-			expect(promise._value[1]:find("hahah")).to.be.ok()
-		end)
-	end)
-end
--- a/plugin/src/Promise.lua
+++ b/plugin/src/Promise.lua
@@ -1,308 +0,0 @@
--[[
-	An implementation of Promises similar to Promise/A+.
-]]
-
-local PROMISE_DEBUG = false
-
-- If promise debugging is on, use a version of pcall that warns on failure.
-- This is useful for finding errors that happen within Promise itself.
-local wpcall
-if PROMISE_DEBUG then
-	wpcall = function(f, ...)
-		local result = { pcall(f, ...) }
-
-		if not result[1] then
-			warn(result[2])
-		end
-
-		return unpack(result)
-	end
-else
-	wpcall = pcall
-end
-
--[[
-	Creates a function that invokes a callback with correct error handling and
-	resolution mechanisms.
-]]
-local function createAdvancer(callback, resolve, reject)
-	return function(...)
-		local result = { wpcall(callback, ...) }
-		local ok = table.remove(result, 1)
-
-		if ok then
-			resolve(unpack(result))
-		else
-			reject(unpack(result))
-		end
-	end
-end
-
-local function isEmpty(t)
-	return next(t) == nil
-end
-
-local Promise = {}
-Promise.__index = Promise
-
-Promise.Status = {
-	Started = "Started",
-	Resolved = "Resolved",
-	Rejected = "Rejected",
-}
-
--[[
-	Constructs a new Promise with the given initializing callback.
-
-	This is generally only called when directly wrapping a non-promise API into
-	a promise-based version.
-
-	The callback will receive 'resolve' and 'reject' methods, used to start
-	invoking the promise chain.
-
-	For example:
-
-		local function get(url)
-			return Promise.new(function(resolve, reject)
-				spawn(function()
-					resolve(HttpService:GetAsync(url))
-				end)
-			end)
-		end
-
-		get("https://google.com")
-			:andThen(function(stuff)
-				print("Got some stuff!", stuff)
-			end)
-]]
-function Promise.new(callback)
-	local promise = {
-		-- Used to locate where a promise was created
-		_source = debug.traceback(),
-
-		-- A tag to identify us as a promise
-		_type = "Promise",
-
-		_status = Promise.Status.Started,
-
-		-- A table containing a list of all results, whether success or failure.
-		-- Only valid if _status is set to something besides Started
-		_value = nil,
-
-		-- If an error occurs with no observers, this will be set.
-		_unhandledRejection = false,
-
-		-- Queues representing functions we should invoke when we update!
-		_queuedResolve = {},
-		_queuedReject = {},
-	}
-
-	setmetatable(promise, Promise)
-
-	local function resolve(...)
-		promise:_resolve(...)
-	end
-
-	local function reject(...)
-		promise:_reject(...)
-	end
-
-	local ok, err = wpcall(callback, resolve, reject)
-
-	if not ok and promise._status == Promise.Status.Started then
-		reject(err)
-	end
-
-	return promise
-end
-
--[[
-	Create a promise that represents the immediately resolved value.
-]]
-function Promise.resolve(value)
-	return Promise.new(function(resolve)
-		resolve(value)
-	end)
-end
-
--[[
-	Create a promise that represents the immediately rejected value.
-]]
-function Promise.reject(value)
-	return Promise.new(function(_, reject)
-		reject(value)
-	end)
-end
-
--[[
-	Returns a new promise that:
-		* is resolved when all input promises resolve
-		* is rejected if ANY input promises reject
-]]
-function Promise.all(...)
-	error("unimplemented", 2)
-end
-
--[[
-	Is the given object a Promise instance?
-]]
-function Promise.is(object)
-	if type(object) ~= "table" then
-		return false
-	end
-
-	return object._type == "Promise"
-end
-
--[[
-	Creates a new promise that receives the result of this promise.
-
-	The given callbacks are invoked depending on that result.
-]]
-function Promise:andThen(successHandler, failureHandler)
-	self._unhandledRejection = false
-
-	-- Create a new promise to follow this part of the chain
-	return Promise.new(function(resolve, reject)
-		-- Our default callbacks just pass values onto the next promise.
-		-- This lets success and failure cascade correctly!
-
-		local successCallback = resolve
-		if successHandler then
-			successCallback = createAdvancer(successHandler, resolve, reject)
-		end
-
-		local failureCallback = reject
-		if failureHandler then
-			failureCallback = createAdvancer(failureHandler, resolve, reject)
-		end
-
-		if self._status == Promise.Status.Started then
-			-- If we haven't resolved yet, put ourselves into the queue
-			table.insert(self._queuedResolve, successCallback)
-			table.insert(self._queuedReject, failureCallback)
-		elseif self._status == Promise.Status.Resolved then
-			-- This promise has already resolved! Trigger success immediately.
-			successCallback(unpack(self._value))
-		elseif self._status == Promise.Status.Rejected then
-			-- This promise died a terrible death! Trigger failure immediately.
-			failureCallback(unpack(self._value))
-		end
-	end)
-end
-
--[[
-	Used to catch any errors that may have occurred in the promise.
-]]
-function Promise:catch(failureCallback)
-	return self:andThen(nil, failureCallback)
-end
-
--[[
-	Yield until the promise is completed.
-
-	This matches the execution model of normal Roblox functions.
-]]
-function Promise:await()
-	self._unhandledRejection = false
-
-	if self._status == Promise.Status.Started then
-		local result
-		local bindable = Instance.new("BindableEvent")
-
-		self:andThen(function(...)
-			result = {...}
-			bindable:Fire(true)
-		end, function(...)
-			result = {...}
-			bindable:Fire(false)
-		end)
-
-		local ok = bindable.Event:Wait()
-		bindable:Destroy()
-
-		if not ok then
-			error(tostring(result[1]), 2)
-		end
-
-		return unpack(result)
-	elseif self._status == Promise.Status.Resolved then
-		return unpack(self._value)
-	elseif self._status == Promise.Status.Rejected then
-		error(tostring(self._value[1]), 2)
-	end
-end
-
-function Promise:_resolve(...)
-	if self._status ~= Promise.Status.Started then
-		return
-	end
-
-	-- If the resolved value was a Promise, we chain onto it!
-	if Promise.is((...)) then
-		-- Without this warning, arguments sometimes mysteriously disappear
-		if select("#", ...) > 1 then
-			local message = ("When returning a Promise from andThen, extra arguments are discarded! See:\n\n%s"):format(
-				self._source
-			)
-			warn(message)
-		end
-
-		(...):andThen(function(...)
-			self:_resolve(...)
-		end, function(...)
-			self:_reject(...)
-		end)
-
-		return
-	end
-
-	self._status = Promise.Status.Resolved
-	self._value = {...}
-
-	-- We assume that these callbacks will not throw errors.
-	for _, callback in ipairs(self._queuedResolve) do
-		callback(...)
-	end
-end
-
-function Promise:_reject(...)
-	if self._status ~= Promise.Status.Started then
-		return
-	end
-
-	self._status = Promise.Status.Rejected
-	self._value = {...}
-
-	-- If there are any rejection handlers, call those!
-	if not isEmpty(self._queuedReject) then
-		-- We assume that these callbacks will not throw errors.
-		for _, callback in ipairs(self._queuedReject) do
-			callback(...)
-		end
-	else
-		-- At this point, no one was able to observe the error.
-		-- An error handler might still be attached if the error occurred
-		-- synchronously. We'll wait one tick, and if there are still no
-		-- observers, then we should put a message in the console.
-
-		self._unhandledRejection = true
-		local err = tostring((...))
-
-		spawn(function()
-			-- Someone observed the error, hooray!
-			if not self._unhandledRejection then
-				return
-			end
-
-			-- Build a reasonable message
-			local message = ("Unhandled promise rejection:\n\n%s\n\n%s"):format(
-				err,
-				self._source
-			)
-			warn(message)
-		end)
-	end
-end
-
-return Promise
--- a/plugin/src/Reconciler.lua
+++ b/plugin/src/Reconciler.lua
@@ -1,237 +0,0 @@
-local Reconciler = {}
-
-local function isInit(item, itemFileName)
-	if item and item.type == "dir" then
-		return
-	end
-
-	return not not itemFileName:find("^init%.")
-end
-
-local function findInit(item)
-	if item.type ~= "dir" then
-		return nil, nil
-	end
-
-	for childFileName, childItem in pairs(item.children) do
-		if isInit(childItem, childFileName) then
-			return childItem, childFileName
-		end
-	end
-
-	return nil, nil
-end
-
-local function itemToName(item, fileName)
-	if item and item.type == "dir" then
-		return fileName, "Folder"
-	elseif item and item.type == "file" or not item then
-		if fileName:find("%.server%.lua$") then
-			return fileName:match("^(.-)%.server%.lua$"), "Script"
-		elseif fileName:find("%.client%.lua$") then
-			return fileName:match("^(.-)%.client%.lua$"), "LocalScript"
-		elseif fileName:find("%.lua") then
-			return fileName:match("^(.-)%.lua$"), "ModuleScript"
-		else
-			return fileName, "StringValue"
-		end
-	else
-		error("unknown item type " .. tostring(item.type))
-	end
-end
-
-local function setValues(rbx, item, fileName)
-	local _, className = itemToName(item, fileName)
-
-	if className:find("Script") then
-		rbx.Source = item.contents
-	else
-		rbx.Value = item.contents
-	end
-end
-
-function Reconciler._reifyShallow(item, fileName)
-	if item.type == "dir" then
-		local initItem, initFileName = findInit(item)
-
-		if initItem then
-			local rbx = Reconciler._reify(initItem, initFileName)
-			rbx.Name = fileName
-
-			return rbx
-		else
-			local rbx = Instance.new("Folder")
-			rbx.Name = fileName
-
-			return rbx
-		end
-	elseif item.type == "file" then
-		local objectName, className = itemToName(item, fileName)
-
-		local rbx = Instance.new(className)
-		rbx.Name = objectName
-
-		setValues(rbx, item, fileName)
-
-		return rbx
-	else
-		error("unknown item type " .. tostring(item.type))
-	end
-end
-
-function Reconciler._reify(item, fileName, parent)
-	local rbx = Reconciler._reifyShallow(item, fileName)
-
-	if item.type == "dir" then
-		for childFileName, childItem in pairs(item.children) do
-			if not isInit(childItem, childFileName) then
-				local childRbx = Reconciler._reify(childItem, childFileName)
-				childRbx.Parent = rbx
-			end
-		end
-	end
-
-	rbx.Parent = parent
-
-	return rbx
-end
-
-function Reconciler.reconcile(rbx, item, fileName, parent)
-	-- Item was deleted!
-	if not item then
-		if isInit(item, fileName) then
-			if not parent then
-				return
-			end
-
-			-- Un-usurp parent!
-			local newParent = Instance.new("Folder")
-			newParent.Name = parent.Name
-
-			for _, child in ipairs(parent:GetChildren()) do
-				child.Parent = newParent
-			end
-
-			newParent.Parent = parent.Parent
-			parent:Destroy()
-
-			return
-		else
-			if rbx then
-				rbx:Destroy()
-			end
-
-			return
-		end
-	end
-
-	if item.type == "dir" then
-		-- Folder was created!
-		if not rbx then
-			return Reconciler._reify(item, fileName, parent)
-		end
-
-		local initItem, initFileName = findInit(item)
-
-		if initItem then
-			local _, initClassName = itemToName(initItem, initFileName)
-
-			if rbx.ClassName == initClassName then
-				setValues(rbx, initItem, initFileName)
-			else
-				rbx:Destroy()
-				return Reconciler._reify(item, fileName, parent)
-			end
-		else
-			if rbx.ClassName ~= "Folder" then
-				rbx:Destroy()
-				return Reconciler._reify(item, fileName, parent)
-			end
-		end
-
-		local visitedChildren = {}
-
-		for childFileName, childItem in pairs(item.children) do
-			if not isInit(childItem, childFileName) then
-				local childName = itemToName(childItem, childFileName)
-
-				visitedChildren[childName] = true
-
-				Reconciler.reconcile(rbx:FindFirstChild(childName), childItem, childFileName, rbx)
-			end
-		end
-
-		for _, childRbx in ipairs(rbx:GetChildren()) do
-			-- Child was deleted!
-			if not visitedChildren[childRbx.Name] then
-				Reconciler.reconcile(childRbx, nil, nil)
-			end
-		end
-
-		return rbx
-	elseif item.type == "file" then
-		if isInit(item, fileName) then
-			-- Usurp our container!
-			local _, className = itemToName(item, fileName)
-
-			if parent.ClassName == className then
-				rbx = parent
-			else
-				rbx = Reconciler._reify(item, fileName, parent.Parent)
-				rbx.Name = parent.Name
-
-				for _, child in ipairs(parent:GetChildren()) do
-					child.Parent = rbx
-				end
-
-				parent:Destroy()
-			end
-
-			setValues(rbx, item, fileName)
-
-			return rbx
-		else
-			if not rbx then
-				return Reconciler._reify(item, fileName, parent)
-			end
-
-			local _, className = itemToName(item, fileName)
-
-			if rbx.ClassName ~= className then
-				rbx:Destroy()
-				return Reconciler._reify(item, fileName, parent)
-			end
-
-			setValues(rbx, item, fileName)
-
-			return rbx
-		end
-	else
-		error("unknown item type " .. tostring(item.type))
-	end
-end
-
-function Reconciler.reconcileRoute(route, item)
-	local location = game
-
-	for i = 1, #route - 1 do
-		local piece = route[i]
-		local newLocation = location:FindFirstChild(piece)
-
-		if not newLocation then
-			newLocation = Instance.new("Folder")
-			newLocation.Name = piece
-			newLocation.Parent = location
-		end
-
-		location = newLocation
-	end
-
-	local fileName = route[#route]
-
-	local name = itemToName(item, fileName)
-	local rbx = location:FindFirstChild(name)
-	Reconciler.reconcile(rbx, item, fileName, location)
-end
-
-return Reconciler
--- a/plugin/src/Server.lua
+++ b/plugin/src/Server.lua
@@ -1,69 +0,0 @@
-local HttpService = game:GetService("HttpService")
-
-local Server = {}
-Server.__index = Server
-
--[[
-	Create a new Server using the given HTTP implementation and replacer.
-
-	If the context becomes invalid, `replacer` will be invoked with a new
-	context that should be suitable to replace this one.
-
-	Attempting to invoke methods on an invalid conext will throw errors!
-]]
-function Server.connect(http)
-	local context = {
-		http = http,
-		serverId = nil,
-		currentTime = 0,
-	}
-
-	setmetatable(context, Server)
-
-	return context:_start()
-end
-
-function Server:_start()
-	return self:getInfo()
-		:andThen(function(response)
-			self.serverId = response.serverId
-			self.currentTime = response.currentTime
-
-			return self
-		end)
-end
-
-function Server:getInfo()
-	return self.http:get("/")
-		:andThen(function(response)
-			response = response:json()
-
-			return response
-		end)
-end
-
-function Server:read(paths)
-	local body = HttpService:JSONEncode(paths)
-
-	return self.http:post("/read", body)
-		:andThen(function(response)
-			response = response:json()
-
-			return response.items
-		end)
-end
-
-function Server:getChanges()
-	local url = ("/changes/%f"):format(self.currentTime)
-
-	return self.http:get(url)
-		:andThen(function(response)
-			response = response:json()
-
-			self.currentTime = response.currentTime
-
-			return response.changes
-		end)
-end
-
-return Server
--- a/rojo.json
+++ b/rojo.json
@@ -1,10 +0,0 @@
-{
-  "name": "rojo",
-  "servePort": 8081,
-  "partitions": {
-    "Rojo": {
-      "path": "plugin/src",
-      "target": "ReplicatedStorage.Rojo"
-    }
-  }
-}
--- a/src/bin.rs
+++ b/src/bin.rs
@@ -1,33 +1,27 @@
-#[macro_use]
-extern crate serde_derive;
-
-#[macro_use]
-extern crate rouille;
-
-#[macro_use]
-extern crate clap;
-
+#[macro_use] extern crate serde_derive;
+#[macro_use] extern crate rouille;
+#[macro_use] extern crate clap;
+#[macro_use] extern crate lazy_static;
 extern crate notify;
 extern crate rand;
 extern crate serde;
 extern crate serde_json;
+extern crate regex;

 pub mod web;
 pub mod core;
 pub mod project;
 pub mod pathext;
 pub mod vfs;
-pub mod vfs_watch;
+pub mod rbx;
+pub mod plugin;
+pub mod plugins;
+pub mod commands;

 use std::path::{Path, PathBuf};
-use std::sync::{Arc, Mutex};
-use std::thread;
+use std::process;

-use core::Config;
 use pathext::canonicalish;
-use project::Project;
-use vfs::Vfs;
-use vfs_watch::VfsWatcher;

 fn main() {
    let matches = clap_app!(rojo =>
@@ -59,126 +53,45 @@ fn main() {
        _ => true,
    };

-    let server_id = rand::random::<u64>();
-
-    if verbose {
-        println!("Server ID: {}", server_id);
-    }
-
    match matches.subcommand() {
        ("init", sub_matches) => {
            let sub_matches = sub_matches.unwrap();
            let project_path = Path::new(sub_matches.value_of("PATH").unwrap_or("."));
            let full_path = canonicalish(project_path);

-            match Project::init(&full_path) {
-                Ok(_) => {
-                    println!("Created new empty project at {}", full_path.display());
-                },
-                Err(e) => {
-                    eprintln!("Failed to create new project.\n{}", e);
-                    std::process::exit(1);
-                },
-            }
+            commands::init(&full_path);
        },
        ("serve", sub_matches) => {
            let sub_matches = sub_matches.unwrap();

            let project_path = match sub_matches.value_of("PROJECT") {
-                Some(v) => PathBuf::from(v),
+                Some(v) => canonicalish(PathBuf::from(v)),
                None => std::env::current_dir().unwrap(),
            };

-            if verbose {
-                println!("Attempting to locate project at {}", project_path.display());
-            }
-
-            let project = match Project::load(&project_path) {
-                Ok(v) => {
-                    println!("Using project from {}", project_path.display());
-                    v
-                },
-                Err(_) => {
-                    println!("Using default project...");
-                    Project::default()
-                },
-            };
-
            let port = {
                match sub_matches.value_of("port") {
                    Some(source) => match source.parse::<u64>() {
-                        Ok(value) => value,
+                        Ok(value) => Some(value),
                        Err(_) => {
                            eprintln!("Invalid port '{}'", source);
-                            std::process::exit(1);
+                            process::exit(1);
                        },
                    },
-                    None => project.serve_port,
+                    None => None,
                }
            };

-            let config = Config {
-                port,
-                verbose,
-                server_id,
-            };
-
-            if verbose {
-                println!("Loading VFS...");
-            }
-
-            let vfs = {
-                let mut vfs = Vfs::new(config.clone());
-
-                for (name, project_partition) in &project.partitions {
-                    let path = {
-                        let given_path = Path::new(&project_partition.path);
-
-                        if given_path.is_absolute() {
-                            given_path.to_path_buf()
-                        } else {
-                            project_path.join(given_path)
-                        }
-                    };
-
-                    if verbose {
-                        println!(
-                            "Partition '{}': {} @ {}",
-                            name,
-                            project_partition.target,
-                            project_partition.path
-                        );
-                    }
-
-                    vfs.partitions.insert(name.clone(), path);
-                }
-
-                Arc::new(Mutex::new(vfs))
-            };
-
-            {
-                let vfs = vfs.clone();
-                let config = config.clone();
-
-                thread::spawn(move || {
-                    VfsWatcher::new(config, vfs).start();
-                });
-            }
-
-            web::start(config.clone(), project.clone(), vfs.clone());
-
-            println!("Server listening on port {}", port);
-
-            loop {}
+            commands::serve(&project_path, verbose, port);
        },
        ("pack", _) => {
            eprintln!("'rojo pack' is not yet implemented!");
-            std::process::exit(1);
+            process::exit(1);
        },
        _ => {
            eprintln!("Please specify a subcommand!");
            eprintln!("Try 'rojo help' for information.");
-            std::process::exit(1);
+            process::exit(1);
        },
    }
 }
--- a/src/commands/init.rs
+++ b/src/commands/init.rs
@@ -0,0 +1,16 @@
+use std::path::PathBuf;
+use std::process;
+
+use project::Project;
+
+pub fn init(project_path: &PathBuf) {
+    match Project::init(project_path) {
+        Ok(_) => {
+            println!("Created new empty project at {}", project_path.display());
+        },
+        Err(e) => {
+            eprintln!("Failed to create new project.\n{}", e);
+            process::exit(1);
+        },
+    }
+}
--- a/src/commands/mod.rs
+++ b/src/commands/mod.rs
@@ -0,0 +1,5 @@
+mod serve;
+mod init;
+
+pub use self::serve::*;
+pub use self::init::*;
--- a/src/commands/serve.rs
+++ b/src/commands/serve.rs
@@ -0,0 +1,99 @@
+use std::path::{Path, PathBuf};
+use std::process;
+use std::sync::{Arc, Mutex};
+use std::thread;
+
+use rand;
+
+use project::{Project, ProjectLoadError};
+use plugin::{PluginChain};
+use plugins::{DefaultPlugin, JsonModelPlugin, ScriptPlugin};
+use vfs::{VfsSession, VfsWatcher};
+use web;
+
+pub fn serve(project_path: &PathBuf, verbose: bool, port: Option<u64>) {
+    let server_id = rand::random::<u64>();
+
+    if verbose {
+        println!("Attempting to locate project at {}...", project_path.display());
+    }
+
+    let project = match Project::load(project_path) {
+        Ok(v) => {
+            println!("Using project from {}", project_path.display());
+            v
+        },
+        Err(err) => {
+            match err {
+                ProjectLoadError::InvalidJson(serde_err) => {
+                    eprintln!(
+                        "Found invalid JSON!\nProject in: {}\nError: {}",
+                        project_path.display(),
+                        serde_err,
+                    );
+
+                    process::exit(1);
+                },
+                ProjectLoadError::FailedToOpen | ProjectLoadError::FailedToRead => {
+                    eprintln!("Found project file, but failed to read it!");
+                    eprintln!(
+                        "Check the permissions of the project file at\n{}",
+                        project_path.display(),
+                    );
+
+                    process::exit(1);
+                },
+                _ => {
+                    // Any other error is fine; use the default project.
+                    println!("Found no project file, using default project...");
+                    Project::default()
+                },
+            }
+        },
+    };
+
+    let web_config = web::WebConfig {
+        verbose,
+        port: port.unwrap_or(project.serve_port),
+        server_id,
+    };
+
+    lazy_static! {
+        static ref PLUGIN_CHAIN: PluginChain = PluginChain::new(vec![
+            Box::new(ScriptPlugin::new()),
+            Box::new(JsonModelPlugin::new()),
+            Box::new(DefaultPlugin::new()),
+        ]);
+    }
+
+    let vfs = {
+        let mut vfs = VfsSession::new(&PLUGIN_CHAIN);
+
+        for (name, project_partition) in &project.partitions {
+            let path = {
+                let given_path = Path::new(&project_partition.path);
+
+                if given_path.is_absolute() {
+                    given_path.to_path_buf()
+                } else {
+                    project_path.join(given_path)
+                }
+            };
+
+            vfs.insert_partition(name, path);
+        }
+
+        Arc::new(Mutex::new(vfs))
+    };
+
+    println!("Server listening on port {}", web_config.port);
+
+    {
+        let vfs = vfs.clone();
+        thread::spawn(move || {
+            VfsWatcher::new(vfs).start();
+        });
+    }
+
+    web::start(web_config, project.clone(), &PLUGIN_CHAIN, vfs.clone());
+}
--- a/src/core.rs
+++ b/src/core.rs
@@ -1,6 +1 @@
-#[derive(Debug, Clone)]
-pub struct Config {
-    pub port: u64,
-    pub verbose: bool,
-    pub server_id: u64,
-}
+pub type Route = Vec<String>;
--- a/src/pathext.rs
+++ b/src/pathext.rs
@@ -31,9 +31,26 @@ fn test_path_to_route() {
        assert_eq!(path_to_route(root, value), result);
    }

-    t(Path::new("/a/b/c"), Path::new("/a/b/c/d"), Some(vec!["d".to_string()]));
+    t(
+        Path::new("/a/b/c"),
+        Path::new("/a/b/c/d"),
+        Some(vec!["d".to_string()]),
+    );
    t(Path::new("/a/b"), Path::new("a"), None);
-    t(Path::new("C:\\foo"), Path::new("C:\\foo\\bar\\baz"), Some(vec!["bar".to_string(), "baz".to_string()]));
+}
+
+#[test]
+#[cfg(target_os = "windows")]
+fn test_path_to_route_windows() {
+    fn t(root: &Path, value: &Path, result: Option<Vec<String>>) {
+        assert_eq!(path_to_route(root, value), result);
+    }
+
+    t(
+        Path::new("C:\\foo"),
+        Path::new("C:\\foo\\bar\\baz"),
+        Some(vec!["bar".to_string(), "baz".to_string()]),
+    );
 }

 /// Turns the path into an absolute one, using the current working directory if
--- a/src/plugin.rs
+++ b/src/plugin.rs
@@ -0,0 +1,82 @@
+use rbx::RbxInstance;
+use vfs::VfsItem;
+use core::Route;
+
+pub enum TransformFileResult {
+    Value(Option<RbxInstance>),
+    Pass,
+
+    // TODO: Error case
+}
+
+pub enum RbxChangeResult {
+    Write(Option<VfsItem>),
+    Pass,
+
+    // TODO: Error case
+}
+
+pub enum FileChangeResult {
+    MarkChanged(Option<Vec<Route>>),
+    Pass,
+}
+
+pub trait Plugin {
+    /// Invoked when a file is read from the filesystem and needs to be turned
+    /// into a Roblox instance.
+    fn transform_file(&self, plugins: &PluginChain, vfs_item: &VfsItem) -> TransformFileResult;
+
+    /// Invoked when a Roblox Instance change is reported by the Roblox Studio
+    /// plugin and needs to be turned into a file to save.
+    fn handle_rbx_change(&self, route: &Route, rbx_item: &RbxInstance) -> RbxChangeResult;
+
+    /// Invoked when a file changes on the filesystem. The result defines what
+    /// routes are marked as needing to be refreshed.
+    fn handle_file_change(&self, route: &Route) -> FileChangeResult;
+}
+
+/// A set of plugins that are composed in order.
+pub struct PluginChain {
+    plugins: Vec<Box<Plugin + Send + Sync>>,
+}
+
+impl PluginChain {
+    pub fn new(plugins: Vec<Box<Plugin + Send + Sync>>) -> PluginChain {
+        PluginChain {
+            plugins,
+        }
+    }
+
+    pub fn transform_file(&self, vfs_item: &VfsItem) -> Option<RbxInstance> {
+        for plugin in &self.plugins {
+            match plugin.transform_file(self, vfs_item) {
+                TransformFileResult::Value(rbx_item) => return rbx_item,
+                TransformFileResult::Pass => {},
+            }
+        }
+
+        None
+    }
+
+    pub fn handle_rbx_change(&self, route: &Route, rbx_item: &RbxInstance) -> Option<VfsItem> {
+        for plugin in &self.plugins {
+            match plugin.handle_rbx_change(route, rbx_item) {
+                RbxChangeResult::Write(vfs_item) => return vfs_item,
+                RbxChangeResult::Pass => {},
+            }
+        }
+
+        None
+    }
+
+    pub fn handle_file_change(&self, route: &Route) -> Option<Vec<Route>> {
+        for plugin in &self.plugins {
+            match plugin.handle_file_change(route) {
+                FileChangeResult::MarkChanged(changes) => return changes,
+                FileChangeResult::Pass => {},
+            }
+        }
+
+        None
+    }
+}
--- a/src/plugins/default_plugin.rs
+++ b/src/plugins/default_plugin.rs
@@ -0,0 +1,67 @@
+use std::collections::HashMap;
+
+use core::Route;
+use plugin::{Plugin, PluginChain, TransformFileResult, RbxChangeResult, FileChangeResult};
+use rbx::{RbxInstance, RbxValue};
+use vfs::VfsItem;
+
+/// A plugin with simple transforms:
+/// * Directories become Folder instances
+/// * Files become StringValue objects with 'Value' as their contents
+pub struct DefaultPlugin;
+
+impl DefaultPlugin {
+    pub fn new() -> DefaultPlugin {
+        DefaultPlugin
+    }
+}
+
+impl Plugin for DefaultPlugin {
+    fn transform_file(&self, plugins: &PluginChain, vfs_item: &VfsItem) -> TransformFileResult {
+        match vfs_item {
+            &VfsItem::File { ref contents, .. } => {
+                let mut properties = HashMap::new();
+
+                properties.insert("Value".to_string(), RbxValue::String {
+                    value: contents.clone(),
+                });
+
+                TransformFileResult::Value(Some(RbxInstance {
+                    name: vfs_item.name().clone(),
+                    class_name: "StringValue".to_string(),
+                    children: Vec::new(),
+                    properties,
+                    route: Some(vfs_item.route().to_vec()),
+                }))
+            },
+            &VfsItem::Dir { ref children, .. } => {
+                let mut rbx_children = Vec::new();
+
+                for (_, child_item) in children {
+                    match plugins.transform_file(child_item) {
+                        Some(rbx_item) => {
+                            rbx_children.push(rbx_item);
+                        },
+                        _ => {},
+                    }
+                }
+
+                TransformFileResult::Value(Some(RbxInstance {
+                    name: vfs_item.name().clone(),
+                    class_name: "Folder".to_string(),
+                    children: rbx_children,
+                    properties: HashMap::new(),
+                    route: Some(vfs_item.route().to_vec()),
+                }))
+            },
+        }
+    }
+
+    fn handle_file_change(&self, route: &Route) -> FileChangeResult {
+        FileChangeResult::MarkChanged(Some(vec![route.clone()]))
+    }
+
+    fn handle_rbx_change(&self, _route: &Route, _rbx_item: &RbxInstance) -> RbxChangeResult {
+        RbxChangeResult::Pass
+    }
+}
--- a/src/plugins/json_model_plugin.rs
+++ b/src/plugins/json_model_plugin.rs
@@ -0,0 +1,55 @@
+use regex::Regex;
+use serde_json;
+
+use core::Route;
+use plugin::{Plugin, PluginChain, TransformFileResult, RbxChangeResult, FileChangeResult};
+use rbx::RbxInstance;
+use vfs::VfsItem;
+
+lazy_static! {
+    static ref JSON_MODEL_PATTERN: Regex = Regex::new(r"^(.*?)\.model\.json$").unwrap();
+}
+
+pub struct JsonModelPlugin;
+
+impl JsonModelPlugin {
+    pub fn new() -> JsonModelPlugin {
+        JsonModelPlugin
+    }
+}
+
+impl Plugin for JsonModelPlugin {
+    fn transform_file(&self, _plugins: &PluginChain, vfs_item: &VfsItem) -> TransformFileResult {
+        match vfs_item {
+            &VfsItem::File { ref contents, .. } => {
+                let rbx_name = match JSON_MODEL_PATTERN.captures(vfs_item.name()) {
+                    Some(captures) => captures.get(1).unwrap().as_str().to_string(),
+                    None => return TransformFileResult::Pass,
+                };
+
+                let mut rbx_item: RbxInstance = match serde_json::from_str(contents) {
+                    Ok(v) => v,
+                    Err(e) => {
+                        eprintln!("Unable to parse JSON Model File named {}: {}", vfs_item.name(), e);
+
+                        return TransformFileResult::Pass; // This should be an error in the future!
+                    },
+                };
+
+                rbx_item.route = Some(vfs_item.route().to_vec());
+                rbx_item.name = rbx_name;
+
+                TransformFileResult::Value(Some(rbx_item))
+            },
+            &VfsItem::Dir { .. } => TransformFileResult::Pass,
+        }
+    }
+
+    fn handle_file_change(&self, _route: &Route) -> FileChangeResult {
+        FileChangeResult::Pass
+    }
+
+    fn handle_rbx_change(&self, _route: &Route, _rbx_item: &RbxInstance) -> RbxChangeResult {
+        RbxChangeResult::Pass
+    }
+}
--- a/src/plugins/mod.rs
+++ b/src/plugins/mod.rs
@@ -0,0 +1,7 @@
+mod default_plugin;
+mod script_plugin;
+mod json_model_plugin;
+
+pub use self::default_plugin::*;
+pub use self::script_plugin::*;
+pub use self::json_model_plugin::*;
--- a/src/plugins/script_plugin.rs
+++ b/src/plugins/script_plugin.rs
@@ -0,0 +1,124 @@
+use std::collections::HashMap;
+
+use regex::Regex;
+
+use core::Route;
+use plugin::{Plugin, PluginChain, TransformFileResult, RbxChangeResult, FileChangeResult};
+use rbx::{RbxInstance, RbxValue};
+use vfs::VfsItem;
+
+lazy_static! {
+    static ref SERVER_PATTERN: Regex = Regex::new(r"^(.*?)\.server\.lua$").unwrap();
+    static ref CLIENT_PATTERN: Regex = Regex::new(r"^(.*?)\.client\.lua$").unwrap();
+    static ref MODULE_PATTERN: Regex = Regex::new(r"^(.*?)\.lua$").unwrap();
+}
+
+static SERVER_INIT: &'static str = "init.server.lua";
+static CLIENT_INIT: &'static str = "init.client.lua";
+static MODULE_INIT: &'static str = "init.lua";
+
+pub struct ScriptPlugin;
+
+impl ScriptPlugin {
+    pub fn new() -> ScriptPlugin {
+        ScriptPlugin
+    }
+}
+
+impl Plugin for ScriptPlugin {
+    fn transform_file(&self, plugins: &PluginChain, vfs_item: &VfsItem) -> TransformFileResult {
+        match vfs_item {
+            &VfsItem::File { ref contents, .. } => {
+                let name = vfs_item.name();
+
+                let (class_name, rbx_name) = {
+                    if let Some(captures) = SERVER_PATTERN.captures(name) {
+                        ("Script".to_string(), captures.get(1).unwrap().as_str().to_string())
+                    } else if let Some(captures) = CLIENT_PATTERN.captures(name) {
+                        ("LocalScript".to_string(), captures.get(1).unwrap().as_str().to_string())
+                    } else if let Some(captures) = MODULE_PATTERN.captures(name) {
+                        ("ModuleScript".to_string(), captures.get(1).unwrap().as_str().to_string())
+                    } else {
+                        return TransformFileResult::Pass;
+                    }
+                };
+
+                let mut properties = HashMap::new();
+
+                properties.insert("Source".to_string(), RbxValue::String {
+                    value: contents.clone(),
+                });
+
+                TransformFileResult::Value(Some(RbxInstance {
+                    name: rbx_name,
+                    class_name: class_name,
+                    children: Vec::new(),
+                    properties,
+                    route: Some(vfs_item.route().to_vec()),
+                }))
+            },
+            &VfsItem::Dir { ref children, .. } => {
+                let init_item = {
+                    let maybe_item = children.get(SERVER_INIT)
+                        .or(children.get(CLIENT_INIT))
+                        .or(children.get(MODULE_INIT));
+
+                    match maybe_item {
+                        Some(v) => v,
+                        None => return TransformFileResult::Pass,
+                    }
+                };
+
+                let mut rbx_item = match self.transform_file(plugins, init_item) {
+                    TransformFileResult::Value(Some(item)) => item,
+                    _ => {
+                        eprintln!("Inconsistency detected in ScriptPlugin!");
+                        return TransformFileResult::Pass;
+                    },
+                };
+
+                rbx_item.name.clear();
+                rbx_item.name.push_str(vfs_item.name());
+
+                for (child_name, child_item) in children {
+                    if child_name == init_item.name() {
+                        continue;
+                    }
+
+                    match plugins.transform_file(child_item) {
+                        Some(child_rbx_item) => {
+                            rbx_item.children.push(child_rbx_item);
+                        },
+                        _ => {},
+                    }
+                }
+
+                TransformFileResult::Value(Some(rbx_item))
+            },
+        }
+    }
+
+    fn handle_file_change(&self, route: &Route) -> FileChangeResult {
+        let leaf = match route.last() {
+            Some(v) => v,
+            None => return FileChangeResult::Pass,
+        };
+
+        let is_init = leaf == SERVER_INIT
+            || leaf == CLIENT_INIT
+            || leaf == MODULE_INIT;
+
+        if is_init {
+            let mut changed = route.clone();
+            changed.pop();
+
+            FileChangeResult::MarkChanged(Some(vec![changed]))
+        } else {
+            FileChangeResult::Pass
+        }
+    }
+
+    fn handle_rbx_change(&self, _route: &Route, _rbx_item: &RbxInstance) -> RbxChangeResult {
+        RbxChangeResult::Pass
+    }
+}
--- a/src/project.rs
+++ b/src/project.rs
@@ -13,7 +13,7 @@ pub enum ProjectLoadError {
    DidNotExist,
    FailedToOpen,
    FailedToRead,
-    Invalid,
+    InvalidJson(serde_json::Error),
 }

 #[derive(Debug)]
@@ -44,10 +44,19 @@ impl fmt::Display for ProjectInitError {
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ProjectPartition {
+    /// A slash-separated path to a file or folder, relative to the project's
+    /// directory.
    pub path: String,
+
+    /// A dot-separated route to a Roblox instance, relative to game.
    pub target: String,
 }

+/// Represents a project configured by a user for use with Rojo. Holds anything
+/// that can be configured with `rojo.json`.
+///
+/// In the future, this object will hold dependency information and other handy
+/// configurables
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(default, rename_all = "camelCase")]
 pub struct Project {
@@ -57,6 +66,7 @@ pub struct Project {
 }

 impl Project {
+    /// Creates a new empty Project object with the given name.
    pub fn new<T: Into<String>>(name: T) -> Project {
        Project {
            name: name.into(),
@@ -64,10 +74,12 @@ impl Project {
        }
    }

+    /// Initializes a new project inside the given folder path.
    pub fn init<T: AsRef<Path>>(location: T) -> Result<Project, ProjectInitError> {
        let location = location.as_ref();
        let package_path = location.join(PROJECT_FILENAME);

+        // We abort if the project file already exists.
        match fs::metadata(&package_path) {
            Ok(_) => return Err(ProjectInitError::AlreadyExists),
            Err(_) => {},
@@ -78,11 +90,14 @@ impl Project {
            Err(_) => return Err(ProjectInitError::FailedToCreate),
        };

+        // Try to give the project a meaningful name.
+        // If we can't, we'll just fall back to a default.
        let name = match location.file_name() {
            Some(v) => v.to_string_lossy().into_owned(),
            None => "new-project".to_string(),
        };

+        // Configure the project with all of the values we know so far.
        let project = Project::new(name);
        let serialized = serde_json::to_string_pretty(&project).unwrap();

@@ -94,6 +109,8 @@ impl Project {
        Ok(project)
    }

+    /// Attempts to load a project from the file named PROJECT_FILENAME from the
+    /// given folder.
    pub fn load<T: AsRef<Path>>(location: T) -> Result<Project, ProjectLoadError> {
        let package_path = location.as_ref().join(Path::new(PROJECT_FILENAME));

@@ -116,10 +133,11 @@ impl Project {

        match serde_json::from_str(&contents) {
            Ok(v) => Ok(v),
-            Err(_) => return Err(ProjectLoadError::Invalid),
+            Err(e) => return Err(ProjectLoadError::InvalidJson(e)),
        }
    }

+    /// Saves the given project file to the given folder with the appropriate name.
    pub fn save<T: AsRef<Path>>(&self, location: T) -> Result<(), ProjectSaveError> {
        let package_path = location.as_ref().join(Path::new(PROJECT_FILENAME));

@@ -139,7 +157,7 @@ impl Project {
 impl Default for Project {
    fn default() -> Project {
        Project {
-            name: "some-project".to_string(),
+            name: "new-project".to_string(),
            serve_port: 8000,
            partitions: HashMap::new(),
        }
--- a/src/rbx.rs
+++ b/src/rbx.rs
@@ -0,0 +1,26 @@
+use std::collections::HashMap;
+
+/// Represents data about a Roblox instance
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct RbxInstance {
+    pub name: String,
+    pub class_name: String,
+    pub children: Vec<RbxInstance>,
+    pub properties: HashMap<String, RbxValue>,
+
+    /// The route that this instance was generated from, if there was one.
+    pub route: Option<Vec<String>>,
+}
+
+/// Any kind value that can be used by Roblox
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", tag = "type")]
+pub enum RbxValue {
+    String {
+        value: String,
+    },
+
+    // TODO: Other primitives
+    // TODO: Compound types like Vector3
+}
--- a/src/vfs/mod.rs
+++ b/src/vfs/mod.rs
@@ -0,0 +1,7 @@
+mod vfs_session;
+mod vfs_item;
+mod vfs_watcher;
+
+pub use self::vfs_session::*;
+pub use self::vfs_item::*;
+pub use self::vfs_watcher::*;
--- a/src/vfs/vfs_item.rs
+++ b/src/vfs/vfs_item.rs
@@ -0,0 +1,31 @@
+use std::collections::HashMap;
+
+/// A VfsItem represents either a file or directory as it came from the filesystem.
+///
+/// The interface here is intentionally simplified to make it easier to traverse
+/// files that have been read into memory.
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", tag = "type")]
+pub enum VfsItem {
+    File {
+        route: Vec<String>,
+        contents: String,
+    },
+    Dir {
+        route: Vec<String>,
+        children: HashMap<String, VfsItem>,
+    },
+}
+
+impl VfsItem {
+    pub fn name(&self) -> &String {
+        self.route().last().unwrap()
+    }
+
+    pub fn route(&self) -> &[String] {
+        match self {
+            &VfsItem::File { ref route, .. } => route,
+            &VfsItem::Dir { ref route, .. } => route,
+        }
+    }
+}
--- a/src/vfs/vfs_session.rs
+++ b/src/vfs/vfs_session.rs
@@ -1,30 +1,30 @@
-use std::borrow::Borrow;
 use std::collections::HashMap;
 use std::fs::{self, File};
 use std::io::Read;
 use std::path::{Path, PathBuf};
 use std::time::Instant;

-use core::Config;
+use plugin::PluginChain;
+use vfs::VfsItem;

 /// Represents a virtual layer over multiple parts of the filesystem.
 ///
 /// Paths in this system are represented as slices of strings, and are always
 /// relative to a partition, which is an absolute path into the real filesystem.
-pub struct Vfs {
+pub struct VfsSession {
    /// Contains all of the partitions mounted by the Vfs.
    ///
    /// These must be absolute paths!
-    pub partitions: HashMap<String, PathBuf>,
-
-    /// When the Vfs was initialized; used for change tracking.
-    pub start_time: Instant,
+    partitions: HashMap<String, PathBuf>,

    /// A chronologically-sorted list of routes that changed since the Vfs was
    /// created, along with a timestamp denoting when.
-    pub change_history: Vec<VfsChange>,
+    change_history: Vec<VfsChange>,

-    config: Config,
+    /// When the Vfs was initialized; used for change tracking.
+    start_time: Instant,
+
+    plugin_chain: &'static PluginChain,
 }

 #[derive(Debug, Serialize, Deserialize)]
@@ -34,26 +34,31 @@ pub struct VfsChange {
    route: Vec<String>,
 }

-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", tag = "type")]
-pub enum VfsItem {
-    File { contents: String },
-    Dir { children: HashMap<String, VfsItem> },
-}
-
-impl Vfs {
-    pub fn new(config: Config) -> Vfs {
-        Vfs {
+impl VfsSession {
+    pub fn new(plugin_chain: &'static PluginChain) -> VfsSession {
+        VfsSession {
            partitions: HashMap::new(),
            start_time: Instant::now(),
            change_history: Vec::new(),
-            config,
+            plugin_chain,
        }
    }

-    fn route_to_path<R: Borrow<str>>(&self, route: &[R]) -> Option<PathBuf> {
+    pub fn get_partitions(&self) -> &HashMap<String, PathBuf> {
+        &self.partitions
+    }
+
+    pub fn insert_partition<P: Into<PathBuf>>(&mut self, name: &str, path: P) {
+        let path = path.into();
+
+        assert!(path.is_absolute());
+
+        self.partitions.insert(name.to_string(), path.into());
+    }
+
+    fn route_to_path(&self, route: &[String]) -> Option<PathBuf> {
        let (partition_name, rest) = match route.split_first() {
-            Some((first, rest)) => (first.borrow(), rest),
+            Some((first, rest)) => (first, rest),
            None => return None,
        };

@@ -62,7 +67,12 @@ impl Vfs {
            None => return None,
        };

-        let full_path = {
+        // It's possible that the partition points to a file if `rest` is empty.
+        // Joining "" onto a path will put a trailing slash on, which causes
+        // file reads to fail.
+        let full_path = if rest.is_empty() {
+            partition.clone()
+        } else {
            let joined = rest.join("/");
            let relative = Path::new(&joined);

@@ -72,7 +82,8 @@ impl Vfs {
        Some(full_path)
    }

-    fn read_dir<P: AsRef<Path>>(&self, path: P) -> Result<VfsItem, ()> {
+    fn read_dir<P: AsRef<Path>>(&self, route: &[String], path: P) -> Result<VfsItem, ()> {
+        let path = path.as_ref();
        let reader = match fs::read_dir(path) {
            Ok(v) => v,
            Err(_) => return Err(()),
@@ -87,11 +98,13 @@ impl Vfs {
            };

            let path = entry.path();
+            let name = path.file_name().unwrap().to_string_lossy().into_owned();

-            match self.read_path(&path) {
+            let mut child_route = route.iter().cloned().collect::<Vec<_>>();
+            child_route.push(name.clone());
+
+            match self.read_path(&child_route, &path) {
                Ok(child_item) => {
-                    let name = path.file_name().unwrap().to_string_lossy().into_owned();
-
                    children.insert(name, child_item);
                },
                Err(_) => {},
@@ -99,11 +112,13 @@ impl Vfs {
        }

        Ok(VfsItem::Dir {
+            route: route.iter().cloned().collect::<Vec<_>>(),
            children,
        })
    }

-    fn read_file<P: AsRef<Path>>(&self, path: P) -> Result<VfsItem, ()> {
+    fn read_file<P: AsRef<Path>>(&self, route: &[String], path: P) -> Result<VfsItem, ()> {
+        let path = path.as_ref();
        let mut file = match File::open(path) {
            Ok(v) => v,
            Err(_) => return Err(()),
@@ -117,11 +132,12 @@ impl Vfs {
        }

        Ok(VfsItem::File {
+            route: route.iter().cloned().collect::<Vec<_>>(),
            contents,
        })
    }

-    fn read_path<P: AsRef<Path>>(&self, path: P) -> Result<VfsItem, ()> {
+    fn read_path<P: AsRef<Path>>(&self, route: &[String], path: P) -> Result<VfsItem, ()> {
        let path = path.as_ref();

        let metadata = match fs::metadata(path) {
@@ -130,31 +146,38 @@ impl Vfs {
        };

        if metadata.is_dir() {
-            self.read_dir(path)
+            self.read_dir(route, path)
        } else if metadata.is_file() {
-            self.read_file(path)
+            self.read_file(route, path)
        } else {
            Err(())
        }
    }

+    /// Get the current time, used for logging timestamps for file changes.
    pub fn current_time(&self) -> f64 {
        let elapsed = self.start_time.elapsed();

        elapsed.as_secs() as f64 + elapsed.subsec_nanos() as f64 * 1e-9
    }

+    /// Register a new change to the filesystem at the given timestamp and VFS
+    /// route.
    pub fn add_change(&mut self, timestamp: f64, route: Vec<String>) {
-        if self.config.verbose {
-            println!("Added change {:?}", route);
+        match self.plugin_chain.handle_file_change(&route) {
+            Some(routes) => {
+                for route in routes {
+                    self.change_history.push(VfsChange {
+                        timestamp,
+                        route,
+                    });
+                }
+            },
+            None => {}
        }
-
-        self.change_history.push(VfsChange {
-            timestamp,
-            route,
-        });
    }

+    /// Collect a list of changes that occured since the given timestamp.
    pub fn changes_since(&self, timestamp: f64) -> &[VfsChange] {
        let mut marker: Option<usize> = None;

@@ -173,18 +196,19 @@ impl Vfs {
        }
    }

-    pub fn read<R: Borrow<str>>(&self, route: &[R]) -> Result<VfsItem, ()> {
+    /// Read an item from the filesystem using the given VFS route.
+    pub fn read(&self, route: &[String]) -> Result<VfsItem, ()> {
        match self.route_to_path(route) {
-            Some(path) => self.read_path(&path),
+            Some(path) => self.read_path(route, &path),
            None => Err(()),
        }
    }

-    pub fn write<R: Borrow<str>>(&self, _route: &[R], _item: VfsItem) -> Result<(), ()> {
+    pub fn write(&self, _route: &[String], _item: VfsItem) -> Result<(), ()> {
        unimplemented!()
    }

-    pub fn delete<R: Borrow<str>>(&self, _route: &[R]) -> Result<(), ()> {
+    pub fn delete(&self, _route: &[String]) -> Result<(), ()> {
        unimplemented!()
    }
 }
--- a/src/vfs/vfs_watcher.rs
+++ b/src/vfs/vfs_watcher.rs
@@ -0,0 +1,105 @@
+use std::path::PathBuf;
+use std::sync::{mpsc, Arc, Mutex};
+use std::thread;
+use std::time::Duration;
+
+use notify::{DebouncedEvent, RecommendedWatcher, RecursiveMode, Watcher};
+
+use pathext::path_to_route;
+use vfs::VfsSession;
+
+/// An object that registers watchers on the real filesystem and relays those
+/// changes to the virtual filesystem layer.
+pub struct VfsWatcher {
+    vfs: Arc<Mutex<VfsSession>>,
+}
+
+impl VfsWatcher {
+    pub fn new(vfs: Arc<Mutex<VfsSession>>) -> VfsWatcher {
+        VfsWatcher {
+            vfs,
+        }
+    }
+
+    fn start_watcher(
+        vfs: Arc<Mutex<VfsSession>>,
+        rx: mpsc::Receiver<DebouncedEvent>,
+        partition_name: String,
+        root_path: PathBuf,
+    ) {
+        loop {
+            let event = rx.recv().unwrap();
+
+            let mut vfs = vfs.lock().unwrap();
+            let current_time = vfs.current_time();
+
+            match event {
+                DebouncedEvent::Write(ref change_path) |
+                DebouncedEvent::Create(ref change_path) |
+                DebouncedEvent::Remove(ref change_path) => {
+                    if let Some(mut route) = path_to_route(&root_path, change_path) {
+                        route.insert(0, partition_name.clone());
+
+                        vfs.add_change(current_time, route);
+                    } else {
+                        eprintln!("Failed to get route from {}", change_path.display());
+                    }
+                },
+                DebouncedEvent::Rename(ref from_change, ref to_change) => {
+                    if let Some(mut route) = path_to_route(&root_path, from_change) {
+                        route.insert(0, partition_name.clone());
+
+                        vfs.add_change(current_time, route);
+                    } else {
+                        eprintln!("Failed to get route from {}", from_change.display());
+                    }
+
+                    if let Some(mut route) = path_to_route(&root_path, to_change) {
+                        route.insert(0, partition_name.clone());
+
+                        vfs.add_change(current_time, route);
+                    } else {
+                        eprintln!("Failed to get route from {}", to_change.display());
+                    }
+                },
+                _ => {},
+            }
+        }
+    }
+
+    pub fn start(self) {
+        let mut watchers = Vec::new();
+
+        // Create an extra scope so that `vfs` gets dropped and unlocked
+        {
+            let vfs = self.vfs.lock().unwrap();
+
+            for (ref partition_name, ref root_path) in vfs.get_partitions() {
+                let (tx, rx) = mpsc::channel();
+
+                let mut watcher: RecommendedWatcher = Watcher::new(tx, Duration::from_secs(1))
+                    .expect("Unable to create watcher!");
+
+                watcher
+                    .watch(&root_path, RecursiveMode::Recursive)
+                    .expect("Unable to watch path!");
+
+                watchers.push(watcher);
+
+                {
+                    let partition_name = partition_name.to_string();
+                    let root_path = root_path.to_path_buf();
+                    let vfs = self.vfs.clone();
+
+                    thread::spawn(move || {
+                        Self::start_watcher(vfs, rx, partition_name, root_path);
+                    });
+                }
+            }
+        }
+
+        loop {
+            thread::park();
+        }
+    }
+}
--- a/src/vfs_watch.rs
+++ b/src/vfs_watch.rs
@@ -1,97 +0,0 @@
-use std::sync::{mpsc, Arc, Mutex};
-use std::thread;
-use std::time::Duration;
-
-use notify::{DebouncedEvent, RecommendedWatcher, RecursiveMode, Watcher};
-
-use vfs::Vfs;
-use pathext::path_to_route;
-use core::Config;
-
-pub struct VfsWatcher {
-    vfs: Arc<Mutex<Vfs>>,
-    watchers: Vec<RecommendedWatcher>,
-    config: Config,
-}
-
-impl VfsWatcher {
-    pub fn new(config: Config, vfs: Arc<Mutex<Vfs>>) -> VfsWatcher {
-        VfsWatcher {
-            vfs,
-            watchers: Vec::new(),
-            config,
-        }
-    }
-
-    pub fn start(mut self) {
-        {
-            let outer_vfs = self.vfs.lock().unwrap();
-
-            for (partition_name, root_path) in &outer_vfs.partitions {
-                let (tx, rx) = mpsc::channel();
-                let partition_name = partition_name.clone();
-                let root_path = root_path.clone();
-
-                let mut watcher: RecommendedWatcher = Watcher::new(tx, Duration::from_secs(1))
-                    .expect("Unable to create watcher!");
-
-                watcher
-                    .watch(&root_path, RecursiveMode::Recursive)
-                    .expect("Unable to watch path!");
-
-                self.watchers.push(watcher);
-
-                {
-                    let vfs = self.vfs.clone();
-                    let config = self.config.clone();
-
-                    thread::spawn(move || {
-                        loop {
-                            let event = rx.recv().unwrap();
-                            let mut vfs = vfs.lock().unwrap();
-                            let current_time = vfs.current_time();
-
-                            if config.verbose {
-                                println!("FS event {:?}", event);
-                            }
-
-                            match event {
-                                DebouncedEvent::Write(ref change_path) |
-                                DebouncedEvent::Create(ref change_path) |
-                                DebouncedEvent::Remove(ref change_path) => {
-                                    if let Some(mut route) = path_to_route(&root_path, change_path) {
-                                        route.insert(0, partition_name.clone());
-
-                                        vfs.add_change(current_time, route);
-                                    } else {
-                                        println!("Failed to get route from {}", change_path.display());
-                                    }
-                                },
-                                DebouncedEvent::Rename(ref from_change, ref to_change) => {
-                                    if let Some(mut route) = path_to_route(&root_path, from_change) {
-                                        route.insert(0, partition_name.clone());
-
-                                        vfs.add_change(current_time, route);
-                                    } else {
-                                        println!("Failed to get route from {}", from_change.display());
-                                    }
-
-                                    if let Some(mut route) = path_to_route(&root_path, to_change) {
-                                        route.insert(0, partition_name.clone());
-
-                                        vfs.add_change(current_time, route);
-                                    } else {
-                                        println!("Failed to get route from {}", to_change.display());
-                                    }
-                                },
-                                _ => {},
-                            }
-                        }
-                    });
-                }
-            }
-        }
-
-        loop {}
-    }
-}
--- a/src/web.rs
+++ b/src/web.rs
@@ -1,16 +1,23 @@
 use std::io::Read;
 use std::sync::{Arc, Mutex};
-use std::thread;

 use rouille;
 use serde;
 use serde_json;

-use core::Config;
 use project::Project;
-use vfs::{Vfs, VfsItem, VfsChange};
+use vfs::{VfsSession, VfsChange};
+use rbx::RbxInstance;
+use plugin::PluginChain;

-static MAX_BODY_SIZE: usize = 25 * 1024 * 1025; // 25 MiB
+static MAX_BODY_SIZE: usize = 25 * 1024 * 1024; // 25 MiB
+
+/// The set of configuration the web server needs to start.
+pub struct WebConfig {
+    pub port: u64,
+    pub verbose: bool,
+    pub server_id: u64,
+}

 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -25,7 +32,7 @@ struct ServerInfo<'a> {
 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 struct ReadResult<'a> {
-    items: Vec<Option<VfsItem>>,
+    items: Vec<Option<RbxInstance>>,
    server_id: &'a str,
    current_time: f64,
 }
@@ -38,12 +45,24 @@ struct ChangesResult<'a> {
    current_time: f64,
 }

+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct WriteSpecifier {
+    route: String,
+    item: RbxInstance,
+}
+
 fn json<T: serde::Serialize>(value: T) -> rouille::Response {
    let data = serde_json::to_string(&value).unwrap();
    rouille::Response::from_data("application/json", data)
 }

+/// Pulls text that may be JSON out of a Rouille Request object.
+///
+/// Doesn't do any actual parsing -- all this method does is verify the content
+/// type of the request and read the request's body.
 fn read_json_text(request: &rouille::Request) -> Option<String> {
+    // Bail out if the request body isn't marked as JSON
    match request.header("Content-Type") {
        Some(header) => if !header.starts_with("application/json") {
            return None;
@@ -56,14 +75,15 @@ fn read_json_text(request: &rouille::Request) -> Option<String> {
        None => return None,
    };

+    // Allocate a buffer and read up to MAX_BODY_SIZE+1 bytes into it.
    let mut out = Vec::new();
-    match body.take(MAX_BODY_SIZE.saturating_add(1) as u64)
-        .read_to_end(&mut out)
-    {
+    match body.take(MAX_BODY_SIZE.saturating_add(1) as u64).read_to_end(&mut out) {
        Ok(_) => {},
        Err(_) => return None,
    }

+    // If the body was too big (MAX_BODY_SIZE+1), we abort instead of trying to
+    // process it.
    if out.len() > MAX_BODY_SIZE {
        return None;
    }
@@ -76,6 +96,7 @@ fn read_json_text(request: &rouille::Request) -> Option<String> {
    Some(parsed)
 }

+/// Reads the body out of a Rouille Request and attempts to turn it into JSON.
 fn read_json<T>(request: &rouille::Request) -> Option<T>
 where
    T: serde::de::DeserializeOwned,
@@ -90,81 +111,115 @@ where
        Err(_) => return None,
    };

+    // TODO: Change return type to some sort of Result
+
    Some(parsed)
 }

-pub fn start(config: Config, project: Project, vfs: Arc<Mutex<Vfs>>) {
+/// Start the Rojo web server and park our current thread.
+pub fn start(config: WebConfig, project: Project, plugin_chain: &'static PluginChain, vfs: Arc<Mutex<VfsSession>>) {
    let address = format!("localhost:{}", config.port);

    let server_id = config.server_id.to_string();

-    thread::spawn(move || {
-        rouille::start_server(address, move |request| {
-            router!(request,
-				(GET) (/) => {
-                    let current_time = {
-                        let vfs = vfs.lock().unwrap();
+    rouille::start_server(address, move |request| {
+        router!(request,
+            (GET) (/) => {
+                // Get a summary of information about the server.

-                        vfs.current_time()
-                    };
-
-					json(ServerInfo {
-                        server_version: env!("CARGO_PKG_VERSION"),
-                        protocol_version: 0,
-                        server_id: &server_id,
-                        project: &project,
-                        current_time,
-                    })
-				},
-
-                (GET) (/changes/{ last_time: f64 }) => {
+                let current_time = {
                    let vfs = vfs.lock().unwrap();
+
+                    vfs.current_time()
+                };
+
+                json(ServerInfo {
+                    server_version: env!("CARGO_PKG_VERSION"),
+                    protocol_version: 1,
+                    server_id: &server_id,
+                    project: &project,
+                    current_time,
+                })
+            },
+
+            (GET) (/changes/{ last_time: f64 }) => {
+                // Get the list of changes since the given time.
+
+                let vfs = vfs.lock().unwrap();
+                let current_time = vfs.current_time();
+                let changes = vfs.changes_since(last_time);
+
+                json(ChangesResult {
+                    changes,
+                    server_id: &server_id,
+                    current_time,
+                })
+            },
+
+            (POST) (/read) => {
+                // Read some instances from the server according to a JSON
+                // format body.
+
+                let read_request: Vec<Vec<String>> = match read_json(&request) {
+                    Some(v) => v,
+                    None => return rouille::Response::empty_400(),
+                };
+
+                // Read the files off of the filesystem that the client
+                // requested.
+                let (items, current_time) = {
+                    let vfs = vfs.lock().unwrap();
+
                    let current_time = vfs.current_time();
-                    let changes = vfs.changes_since(last_time);

-                    json(ChangesResult {
-                        changes,
-                        server_id: &server_id,
-                        current_time,
-                    })
-                },
+                    let mut items = Vec::new();

-				(POST) (/read) => {
-                    let read_request: Vec<Vec<String>> = match read_json(&request) {
-                        Some(v) => v,
-                        None => return rouille::Response::empty_400(),
-                    };
-
-                    let (items, current_time) = {
-                        let vfs = vfs.lock().unwrap();
-
-                        let current_time = vfs.current_time();
-
-                        let mut items = Vec::new();
-
-                        for route in &read_request {
-                            match vfs.read(&route) {
-                                Ok(v) => items.push(Some(v)),
-                                Err(_) => items.push(None),
-                            }
+                    for route in &read_request {
+                        match vfs.read(&route) {
+                            Ok(v) => items.push(Some(v)),
+                            Err(_) => items.push(None),
                        }
+                    }

-                        (items, current_time)
-                    };
+                    (items, current_time)
+                };

-                    json(ReadResult {
-                        server_id: &server_id,
-                        items,
-                        current_time,
+                // Transform all of our VfsItem objects into Roblox instances
+                // the client can use.
+                let rbx_items = items
+                    .iter()
+                    .map(|item| {
+                        match *item {
+                            Some(ref item) => plugin_chain.transform_file(item),
+                            None => None,
+                        }
                    })
-				},
+                    .collect::<Vec<_>>();

-                (POST) (/write) => {
-                    rouille::Response::empty_404()
-                },
+                if config.verbose {
+                    println!("Got read request: {:?}", read_request);
+                    println!("Responding with:\n\t{:?}", rbx_items);
+                }

-				_ => rouille::Response::empty_404()
-			)
-        });
+                json(ReadResult {
+                    server_id: &server_id,
+                    items: rbx_items,
+                    current_time,
+                })
+            },
+
+            (POST) (/write) => {
+                // Not yet implemented.
+
+                let _write_request: Vec<WriteSpecifier> = match read_json(&request) {
+                    Some(v) => v,
+                    None => return rouille::Response::empty_400(),
+                };
+
+                rouille::Response::empty_404()
+            },
+
+            _ => rouille::Response::empty_404()
+        )
    });
 }
--- a/test-folder/meh/init.lua
+++ b/test-folder/meh/init.lua
@@ -1 +0,0 @@
-- meh/init.lua
--- a/test-project/rojo.json
+++ b/test-project/rojo.json
@@ -0,0 +1,10 @@
+{
+  "name": "test-project",
+  "servePort": 8001,
+  "partitions": {
+    "src": {
+      "path": "src",
+      "target": "ReplicatedStorage.TestProject"
+    }
+  }
+}
--- a/test-project/src/bar.client.lua
+++ b/test-project/src/bar.client.lua
--- a/test-project/src/foo.server.lua
+++ b/test-project/src/foo.server.lua
--- a/test-project/src/hello.model.json
+++ b/test-project/src/hello.model.json
@@ -0,0 +1,24 @@
+{
+  "name": "hello",
+  "className": "Model",
+  "children": [
+    {
+      "name": "Some Part",
+      "className": "Part",
+      "children": [],
+      "properties": {}
+    },
+    {
+      "name": "Some StringValue",
+      "className": "StringValue",
+      "children": [],
+      "properties": {
+        "Value": {
+          "type": "string",
+          "value": "Hello, world!"
+        }
+      }
+    }
+  ],
+  "properties": {}
+}
--- a/test-project/src/meh/init.lua
+++ b/test-project/src/meh/init.lua
--- a/test-project/src/meh/x.lua
+++ b/test-project/src/meh/x.lua
--- a/test-project/src/test.lua
+++ b/test-project/src/test.lua
Author	SHA1	Message	Date
Lucien Greathouse	1a1b6d923f	Fix JsonModelPlugin setting the name of the resulting RbxInstance	2018-01-09 16:40:39 -08:00
Lucien Greathouse	27cf2c8740	Add error context to output for JsonModelPlugin	2018-01-09 11:31:48 -08:00
Lucien Greathouse	c08a598d3f	Fix broken file watcher implementation This one took a little bit of tracking down; the VfsWatcher used to spawn a new thread and then stall/park forever. With one of the recent changes to get rid of the extra thread, VfsWatcher started getting dropped, which in turn dropped the watchers created by the notify crate. Because the threads only tie back to the VfsWatcher was a cloned Arc<Mutex<VfsSession>>, everything was fine, except that their mpsc::Receiver objects were no longer receiving events. This manifested itself as the file watcher magically not watching any files. Oops.	2018-01-08 12:33:36 -08:00
Lucien Greathouse	1318842c36	Update dependencies	2018-01-08 12:33:33 -08:00
Lucien Greathouse	86d7d033d7	Add 'route' to each RbxInstance, which tags how the instance was generated	2018-01-05 13:07:09 -08:00
Lucien Greathouse	2df1dfa1cb	Insulate VFS internals a little bit	2018-01-03 18:13:49 -08:00
Lucien Greathouse	78a1c658d8	Simplify and collapse some code from 'rojo serve'	2018-01-03 18:05:00 -08:00
Lucien Greathouse	f52f43fe90	Eliminate extra thread for VfsWatcher	2018-01-03 18:02:56 -08:00
Lucien Greathouse	58b244b7e9	Reorganize some of the unwieldly parts of the codebase * Moved commands into their own folder to reduce `bin.rs`'s size * Moved all of the VFS-related functionality into its own folder * Documented a lot of functions, including a few very obscure ones	2018-01-03 16:45:46 -08:00
Lucien Greathouse	d8bcbee463	Rename RbxItem -> RbxInstance	2018-01-03 16:01:48 -08:00
Lucien Greathouse	f00152a9ac	Add a bit of documentation, this code is lacking it	2018-01-03 16:00:27 -08:00
Lucien Greathouse	9720c56765	Change each VfsItem to keep a full route instead of just its name	2018-01-03 15:56:19 -08:00
Lucien Greathouse	13ce04abb2	Add 'Contributing' section to README	2018-01-03 11:46:07 -08:00
Lucien Greathouse	ab22b55b84	Add further logging in verbose mode	2018-01-02 18:17:44 -08:00
Lucien Greathouse	73117edbe7	Enable JsonModelPlugin by default as a test	2018-01-02 15:41:10 -08:00
Lucien Greathouse	d7e2a3542c	Make notes about compatibility breakage and version 0.4.0	2018-01-02 14:52:51 -08:00
Lucien Greathouse	fe240ed577	Prototype JsonModelPlugin, untested Also cleaned up all of the warnings in the other plugin code	2017-12-21 17:09:32 -08:00
Lucien Greathouse	5e98cbe68f	More detail in DESIGN.md	2017-12-21 16:10:47 -08:00
Lucien Greathouse	7a372dc50c	Add forgotten change about CPU usage	2017-12-21 14:21:03 -08:00
Lucien Greathouse	958b6660be	Update README and DESIGN	2017-12-20 23:00:48 -08:00
Lucien Greathouse	e731811911	Add changes from serve-instances merge	2017-12-20 22:54:10 -08:00
Lucien Greathouse	66144cef2f	Merge branch 'serve-instances'	2017-12-20 22:52:32 -08:00
Lucien Greathouse	13925f5879	Publish 0.3.2	2017-12-20 22:41:23 -08:00
Lucien Greathouse	68ba3fee6c	Fix max body size typo	2017-12-20 22:36:12 -08:00
Lucien Greathouse	95581dbaa6	Pass common plugin chain into web handler	2017-12-20 22:35:26 -08:00
Lucien Greathouse	aaaf3ba0b9	Implement handle_rbx_change API for plugins as a pass	2017-12-20 22:11:46 -08:00
Lucien Greathouse	b885cae086	Rename TransformResult -> TransformFileResult in preparation for two-way syncing	2017-12-20 22:01:38 -08:00
Lucien Greathouse	0f78eb933a	DESIGN doc, stub out /write endpoint	2017-12-20 22:00:01 -08:00
Lucien Greathouse	6ee9a48e20	Use plugin chain code in Vfs	2017-12-18 01:52:13 -08:00
Lucien Greathouse	f90c51e923	Move web server onto main thread	2017-12-18 01:20:04 -08:00
Lucien Greathouse	6472a2cbce	Add handle_file_change to plugin API This solves the problem I was running into with the ScriptPlugin implementation -- if foo/init.lua changes, foo needs to be requested, not 'foo/init.lua' (which would then erroneously create a ModuleScript before this commit)	2017-12-17 22:47:16 -08:00
Lucien Greathouse	c75cbebbf0	Merge branch 'master' into serve-instances	2017-12-17 22:12:04 -08:00
Lucien Greathouse	2e340ff78c	Merge pull request #22 from Quenty/fix-21-high-cpu Fix #21: High CPU usage in a small project	2017-12-17 21:42:21 -08:00
James Onnen	5a20646c57	Address code review, remove unnecessary import	2017-12-17 23:40:32 -06:00
James Onnen	199ebda689	Use ::park() instead of ::sleep()	2017-12-17 14:34:31 -06:00
James Onnen	ae6ca6fb23	Fix #21 : High CPU usage in a small project	2017-12-17 14:20:24 -06:00
Lucien Greathouse	12bfcd7b66	Implement init.lua support in ScriptPlugin	2017-12-14 01:11:44 -08:00
Lucien Greathouse	d365bc076e	Add VfsItem::name to make comparisons easier	2017-12-14 01:11:44 -08:00
Lucien Greathouse	67ac6b7cec	First implementation of 'ScriptPlugin', which serves script files as scripts	2017-12-14 01:11:44 -08:00
Lucien Greathouse	01325c8c7e	Implement PluginChain	2017-12-14 01:11:44 -08:00
Lucien Greathouse	21e9625c36	Prototype plugin architecture, switch instance-based stuff to that	2017-12-14 01:11:44 -08:00
Lucien Greathouse	5bf1f11190	Hacky first go at it -- keeping the existing VfsItem infrastructure I think this is actually a pretty reasonable flow.	2017-12-14 01:11:44 -08:00
Lucien Greathouse	b4e31ea35d	Fix serve path failing to be absolute when given as a relative path	2017-12-14 01:09:10 -08:00
Lucien Greathouse	7c6fe38346	CLI version 0.3.1	2017-12-14 00:24:01 -08:00
Lucien Greathouse	f89d491f29	Run rustfmt I ignored some odd formatting it introduced relating to putting braces on newlines in if-let blocks. This might be a bug, but I didn't find any way to turn that off.	2017-12-13 12:05:11 -08:00
Lucien Greathouse	59b2401c2c	Add more detailed error reporting around invalid projects	2017-12-13 11:56:06 -08:00
Lucien Greathouse	b74ba141d1	Update dependencies, server v0.3.0	2017-12-12 15:01:36 -08:00
Lucien Greathouse	b60f06aa88	Update changelog to represent refactoring of server/client	2017-12-11 15:50:22 -08:00
Lucien Greathouse	f00bcc6d7e	Point to the rojo-plugin repository	2017-12-08 16:52:13 -08:00
Lucien Greathouse	d5b41e2bd4	Remove plugin source, moved to rojo-plugin	2017-12-08 16:50:30 -08:00
Lucien Greathouse	c9a53debc3	Add small config test	2017-12-08 16:32:32 -08:00
Lucien Greathouse	edd45ca02e	Update to Lemur master, 'fixes' Promise tests	2017-12-08 15:53:25 -08:00
Lucien Greathouse	f88cb67210	Back to being custom, since the 'Rust' image has a really old Python version	2017-12-08 15:46:50 -08:00
Lucien Greathouse	302c6cf663	Hybrid build script between Travis and custom installation...	2017-12-08 15:42:56 -08:00
Lucien Greathouse	7995b6eca4	Try radically changing the Travis script	2017-12-08 15:39:17 -08:00
Lucien Greathouse	fd7e737c20	Put back the original Rust config, maybe this will work	2017-12-08 14:26:29 -08:00
Lucien Greathouse	68b3d56619	Remove extra stuff I accidentally added :D	2017-12-08 14:23:58 -08:00
Lucien Greathouse	059ff1777b	Try some random fixes I saw on StackOverflow to work around Travis-CI bug	2017-12-08 14:23:37 -08:00
Lucien Greathouse	dd16cadb4c	Fix indentation, yaml is mean	2017-12-08 14:01:09 -08:00
Lucien Greathouse	551f75f39c	Implement Lua unit tests, this may fail	2017-12-08 13:59:36 -08:00
Lucien Greathouse	23ae0bc186	Wrap warning earlier in Promise	2017-12-08 11:34:22 -08:00
Lucien Greathouse	713a199419	Add spec.lua for testing -- Promise tests are currently broken	2017-12-07 18:08:03 -08:00
Lucien Greathouse	4dc705ee45	Update Rojo project paths to point to new dependencies	2017-12-07 17:36:47 -08:00
Lucien Greathouse	fe4678fdc5	Re-add dependencies with their new path	2017-12-07 17:36:06 -08:00
Lucien Greathouse	97682108aa	Update git module paths, still fighting git submodules a bit	2017-12-07 17:29:00 -08:00
Lucien Greathouse	23d4f45ac9	Fix use of services as partition targets	2017-12-07 16:56:20 -08:00
Lucien Greathouse	9fd6799f93	Fix Travis-CI README link	2017-12-07 15:53:45 -08:00
Lucien Greathouse	5898780e8e	Add note about testing to CHANGES	2017-12-07 15:52:24 -08:00
Lucien Greathouse	1ad20421e9	Move Windows-specific path test into its own file	2017-12-07 15:50:55 -08:00
Lucien Greathouse	4ff9033916	Update dependencies	2017-12-07 15:47:18 -08:00
Lucien Greathouse	37bb0d1aa9	Add Travis-CI configuration to start running tests	2017-12-07 14:48:02 -08:00
Lucien Greathouse	7042680a0a	Fixed usage of a partition pointing to a file instead of a folder	2017-12-07 14:42:30 -08:00
Lucien Greathouse	cafb547894	v0.2.3	2017-12-04 00:19:17 -08:00
Lucien Greathouse	35543c2790	Structured test-folder project	2017-12-04 00:17:46 -08:00
Lucien Greathouse	88efdb5ba4	Make tests compatible with TestEZ, provide 'runTests' script	2017-12-04 00:09:30 -08:00
Lucien Greathouse	eeff7cfd92	Add dependencies to rojo.json for development	2017-12-03 23:57:23 -08:00
Lucien Greathouse	f66cbe0049	Add dependencies: * Roact * Rodux * RoactRodux * TestEZ	2017-12-03 23:50:54 -08:00
Lucien Greathouse	d0c6f2a470	Clean up development a little bit -- when 'dev' is set to true, port 8001 is used	2017-12-03 19:20:54 -08:00
Lucien Greathouse	34d5de9f2c	Tighten init file handling, fixes some buggy edge cases by not supporting them	2017-12-03 19:02:58 -08:00
Lucien Greathouse	16676ebfa1	Add Studio Bridge to README, forgot it!	2017-12-03 13:35:18 -08:00
Lucien Greathouse	bf9be6ccae	Fix reconciler with init files, v0.2.2	2017-12-01 15:18:36 -08:00
Lucien Greathouse	974ebc33c2	Major documentation facelift, should be usable now	2017-12-01 14:07:06 -08:00
Lucien Greathouse	4b03a79cfe	Change config to work with plugin version v0.2.1	2017-12-01 02:49:49 -08:00