v1.4: Genie apps don't need Revise as a dep; AppServer cleanup; app l…

…oader cleanup; tweaked tests.
GenieFramework · Oct 3, 2020 · 14b93a2 · 14b93a2 · essenciary · Oct 3, 2020
1 parent 3e0d8df
commit 14b93a2
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 26 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Genie"
 uuid = "c43c736e-a2d1-11e8-161f-af95117fbd1e"
 authors = ["Adrian Salceanu <[email protected]>"]
-version = "1.3.0"
+version = "1.4.0"
 
 [deps]
 ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"

diff --git a/files/new_app/genie.jl b/files/new_app/genie.jl
@@ -1,5 +1,3 @@
-using Revise
-
 haskey(ENV, "GENIE_ENV") || (ENV["GENIE_ENV"] = "dev")
 if !haskey(ENV, "HOST")
 	ENV["HOST"] = (ENV["GENIE_ENV"] == "dev") ? "127.0.0.1" : "0.0.0.0"

diff --git a/src/AppServer.jl b/src/AppServer.jl
@@ -74,8 +74,6 @@ function startup(port::Int, host::String = Genie.config.server_host;
         HTTP.WebSockets.upgrade(http) do ws
           setup_ws_handler(http.message, ws)
         end
-
-        print_server_status("Web Sockets server running at $host:$ws_port")
       else
         HTTP.handle(HTTP.RequestHandlerFunction(setup_http_handler), http)
       end
@@ -87,10 +85,8 @@ function startup(port::Int, host::String = Genie.config.server_host;
 
   if async
     SERVERS.webserver = @async command()
-    print_server_status("Web Server running at $server_url")
   else
     SERVERS.webserver = command()
-    print_server_status("Web Server stopped")
   end
 
   open_browser && openbrowser(server_url)

diff --git a/src/Configuration.jl b/src/Configuration.jl
@@ -8,7 +8,7 @@ module Configuration
 
 References the current Genie version number.
 """
-const GENIE_VERSION = v"1.3"
+const GENIE_VERSION = v"1.4"
 
 import Logging
 import Genie

diff --git a/src/Generator.jl b/src/Generator.jl
@@ -304,7 +304,6 @@ function install_app_dependencies(app_path::String = "."; testmode::Bool = false
   Pkg.activate(".")
 
   testmode ? Pkg.develop("Genie") : Pkg.add("Genie")
-  Pkg.add("Revise")
   Pkg.add("LoggingExtras")
   Pkg.add("MbedTLS")
 

diff --git a/src/Genie.jl b/src/Genie.jl
@@ -180,21 +180,11 @@ julia> Genie.loadapp(".")
 ```
 """
 function loadapp(path::String = "."; autostart::Bool = false) :: Nothing
-  Core.eval(Main, :(import Revise))
-
-  try
-    Core.eval(Main, quote
-        include(joinpath($path, $(Genie.BOOTSTRAP_FILE_NAME)))
-    end)
-  catch ex
-    rethrow(ex)
-  end
-
-  Core.eval(Main, :(Revise.revise()))
-  Core.eval(Main, :(using Genie))
+  Core.eval(Main, quote
+      include(joinpath($path, $(Genie.BOOTSTRAP_FILE_NAME)))
+  end)
 
-  Core.eval(Main.UserApp, :(Revise.revise()))
-  Core.eval(Main.UserApp, :($autostart && up()))
+  autostart && (Core.eval(Main.UserApp, :(up())))
 
   nothing
 end

diff --git a/test/tests_AppServer.jl b/test/tests_AppServer.jl
@@ -9,18 +9,18 @@
     @test Genie.AppServer.SERVERS.webserver.state == :runnable
 
     servers = Genie.AppServer.down()
-    sleep(1)
+    sleep(2)
     @test servers.webserver.state == :done
     @test Genie.AppServer.SERVERS.webserver.state == :done
 
     servers = Genie.AppServer.startup()
     Genie.AppServer.down(; webserver = false)
-    sleep(1)
+    sleep(2)
     @test servers.webserver.state == :runnable
     @test Genie.AppServer.SERVERS.webserver.state == :runnable
 
     servers = Genie.AppServer.down(; webserver = true)
-    sleep(1)
+    sleep(2)
     @test servers.webserver.state == :done
     @test Genie.AppServer.SERVERS.webserver.state == :done
   end;