Publish 0.3.2

Fix #21: High CPU usage in a small project

CHANGES.md

@@ -1,7 +1,14 @@
 # Rojo Change Log
 
 ## Current Master
-* *No changes*
+* No changes
+
+## 0.3.2
+* Fixed `rojo serve` failing to correctly construct an absolute root path when passed as an argument
+
+## 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

Cargo.lock

@@ -517,7 +517,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "rojo"
-version = "0.3.0"
+version = "0.3.2"
 dependencies = [
  "clap 2.29.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "notify 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rojo"
-version = "0.3.0"
+version = "0.3.2"
 authors = ["Lucien Greathouse <me@lpghatguy.com>"]
 description = "A tool to create robust Roblox projects"
 license = "MIT"

src/bin.rs

@@ -25,7 +25,7 @@ use std::thread;
 
 use core::Config;
 use pathext::canonicalish;
-use project::Project;
+use project::{Project, ProjectLoadError};
 use vfs::Vfs;
 use vfs_watch::VfsWatcher;
 
@@ -85,7 +85,7 @@ fn main() {
             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(),
             };
 
@@ -98,8 +98,32 @@ fn main() {
                     println!("Using project from {}", project_path.display());
                     v
                 },
-                Err(_) => {
-                    println!("Using default project...");
+                Err(err) => {
+                    match err {
+                        ProjectLoadError::InvalidJson(serde_err) => {
+                            eprintln!(
+                                "Found invalid JSON!\nProject in: {}\nError: {}",
+                                project_path.display(),
+                                serde_err,
+                            );
+
+                            std::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(),
+                            );
+
+                            std::process::exit(1);
+                        },
+                        _ => {
+                            // Any other error is fine; use the default project.
+                        },
+                    }
+
+                    println!("Found no project file, using default project...");
                     Project::default()
                 },
             };
@@ -169,7 +193,9 @@ fn main() {
 
             println!("Server listening on port {}", port);
 
-            loop {}
+            loop {
+                thread::park();
+            }
         },
         ("pack", _) => {
             eprintln!("'rojo pack' is not yet implemented!");

src/pathext.rs

@@ -31,7 +31,11 @@ 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);
 }
 
@@ -42,7 +46,11 @@ fn test_path_to_route_windows() {
         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()]));
+    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

src/project.rs

@@ -13,7 +13,7 @@ pub enum ProjectLoadError {
     DidNotExist,
     FailedToOpen,
     FailedToRead,
-    Invalid,
+    InvalidJson(serde_json::Error),
 }
 
 #[derive(Debug)]
@@ -116,7 +116,7 @@ impl Project {
 
         match serde_json::from_str(&contents) {
             Ok(v) => Ok(v),
-            Err(_) => return Err(ProjectLoadError::Invalid),
+            Err(e) => return Err(ProjectLoadError::InvalidJson(e)),
         }
     }
 

src/vfs_watch.rs

@@ -4,9 +4,9 @@ use std::time::Duration;
 
 use notify::{DebouncedEvent, RecommendedWatcher, RecursiveMode, Watcher};
 
-use vfs::Vfs;
-use pathext::path_to_route;
 use core::Config;
+use pathext::path_to_route;
+use vfs::Vfs;
 
 pub struct VfsWatcher {
     vfs: Arc<Mutex<Vfs>>,
@@ -92,6 +92,8 @@ impl VfsWatcher {
             }
         }
 
-        loop {}
+        loop {
+            thread::park();
+        }
     }
 }

src/web.rs

@@ -8,7 +8,7 @@ use serde_json;
 
 use core::Config;
 use project::Project;
-use vfs::{Vfs, VfsItem, VfsChange};
+use vfs::{Vfs, VfsChange, VfsItem};
 
 static MAX_BODY_SIZE: usize = 25 * 1024 * 1025; // 25 MiB