Merge branch 'master' into impl-v2

CHANGES.md

@@ -1,7 +1,11 @@
 # Rojo Change Log
 
 ## Current Master
-*No changes*
+* Plugin now automatically selects `HttpService` if it determines that HTTP isn't enabled ([#58](https://github.com/LPGhatguy/rojo/pull/58))
+
+## 0.4.2 (April 4, 2018)
+* Fixed final case of duplicated instance insertion, caused by reconciled instances not being inserted into `RouteMap`.
+	* The reconciler is still not a perfect solution, especially if script instances get moved around without being destroyed. I don't think this can be fixed before a big refactor.
 
 ## 0.4.1 (April 1, 2018)
 * Merged plugin repository into main Rojo repository for easier tracking.

README.md

@@ -8,7 +8,7 @@
   <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>
-  <img src="https://img.shields.io/badge/latest_version-0.4.1-brightgreen.svg" alt="Current server version" />
+  <img src="https://img.shields.io/badge/latest_version-0.4.2-brightgreen.svg" alt="Current server version" />
 </div>
 
 <hr />

plugin/src/Config.lua

@@ -1,6 +1,6 @@
 return {
 	pollingRate = 0.2,
-	version = {0, 4, 1},
+	version = {0, 4, 2},
 	expectedServerVersionString = "0.4.x",
 	protocolVersion = 1,
 	dev = false,

plugin/src/HttpError.lua

@@ -52,6 +52,9 @@ end
 
 function HttpError:report()
 	warn(self.message)
+	if self.type == HttpError.Error.HttpNotEnabled then
+		game:GetService("Selection"):Set{game:GetService("HttpService")}
+	end
 end
 
 return HttpError

plugin/src/Main.server.lua

@@ -67,13 +67,11 @@ local function main()
 		.Click:Connect(function()
 			checkUpgrade()
 
-			spawn(function()
 			pluginInstance:togglePolling()
 				:catch(function(err)
 					warn(err)
 				end)
 		end)
-		end)
 end
 
 main()

plugin/src/Reconciler.lua

@@ -161,6 +161,10 @@ function Reconciler:reconcile(rbx, item)
 	-- Use a dumb algorithm for reconciling children
 	self:_reconcileChildren(rbx, item)
 
+	if item.Route then
+		self._routeMap:insert(item.Route, rbx)
+	end
+
 	return rbx
 end
 

server/Cargo.lock

@@ -597,7 +597,7 @@ dependencies = [
 
 [[package]]
 name = "rojo"
-version = "0.4.1"
+version = "0.4.2"
 dependencies = [
  "clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

server/Cargo.toml

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