Major Refactor and Cleanup (#15)

* Cleanup progress * Polishing and finishing * Only run CI on pushes to master * Remove unused Display impls
rojo-rbx · Apr 10, 2020 · aa6f4a4 · aa6f4a4
1 parent ba61630
commit aa6f4a4
Show file tree

Hide file tree

Showing 14 changed files with 347 additions and 639 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ name: CI
 on:
   pull_request:
   push:
-    branches: ["*"]
+    branches: ["master"]
 
 jobs:
   build:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,25 +8,25 @@ repository = "https://github.com/rojo-rbx/run-in-roblox"
 license = "MIT"
 readme = "README.md"
 
-[lib]
-name = "run_in_roblox"
-path = "src/lib.rs"
-
 [[bin]]
 name = "run-in-roblox"
 path = "src/main.rs"
 
 [dependencies]
-clap = "2.33.0"
+anyhow = "1.0.28"
 colored = "1.9.3"
 env_logger = "0.7.1"
+fs-err = "2.3.0"
 futures = "0.1.25"
 hyper = "0.12.35"
 log = "0.4.8"
+rand = "0.7.3"
 rbx_binary = "0.5.0"
 rbx_dom_weak = "1.10.1"
 rbx_xml = "0.11.4"
 roblox_install = "0.2.2"
 serde = { version = "1.0.106", features = ["derive"] }
 serde_json = "1.0.51"
+structopt = "0.3.13"
 tempfile = "3.1.0"
+thiserror = "1.0.14"
diff --git a/demo/default.project.json b/demo/default.project.json
@@ -1,21 +1,6 @@
 {
-	"name": "run-in-roblox demo",
-	"tree": {
-		"$className": "DataModel",
-		"ReplicatedStorage": {
-			"$className": "ReplicatedStorage",
-			"src": {
-				"$path": "src"
-			}
-		},
-		"HttpService": {
-			"$className": "HttpService",
-			"$properties": {
-				"HttpEnabled": {
-					"Type": "Bool",
-					"Value": true
-				}
-			}
-		}
-	}
+  "name": "run-in-roblox demo",
+  "tree": {
+    "$className": "DataModel"
+  }
 }
diff --git a/demo/hello.lua b/demo/hello.lua
@@ -0,0 +1,2 @@
+print("Hello, world!")
+error("nah")
diff --git a/demo/src/main.server.lua b/demo/src/main.server.lua
diff --git a/src/core.rs b/src/core.rs
diff --git a/src/lib.rs b/src/lib.rs
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: CI @@
     on:
       pull_request:
       push:
-        branches: ["*"]
+        branches: ["master"]
     jobs:
       build:
@@ Expand Down @@