Merge pull request #712 from hhaensel/hh-compat2

bump compat of LoweredCodeUtils and DotEnv and move package_version from Assets to Util

Project.toml

@@ -42,7 +42,7 @@ ArgParse = "1"
 Base64 = "1.6"
 Dates = "1.6"
 Distributed = "1.6"
-DotEnv = "0.3"
+DotEnv = "0.3, 1"
 EzXML = "1"
 FilePathsBase = "0.9"
 HTTP = "1"
@@ -52,7 +52,7 @@ JSON3 = "1"
 JuliaFormatter = "1"
 Logging = "1.6"
 LoggingExtras = "1"
-LoweredCodeUtils = "=2.3.2"
+LoweredCodeUtils = "2.4.5"
 MIMEs = "0.1"
 Markdown = "1.6"
 Millboard = "0.2"

src/Assets.jl

@@ -5,7 +5,7 @@ module Assets
 
 import Genie, Genie.Configuration, Genie.Router, Genie.WebChannels, Genie.WebThreads
 import Genie.Renderer.Json
-import Pkg
+import Genie.Util.package_version
 
 export include_asset, css_asset, js_asset, js_settings, css, js
 export embedded, channels_script, channels_support, webthreads_script, webthreads_support
@@ -14,24 +14,6 @@ export favicon_support
 
 ### PUBLIC ###
 
-"""
-    package_version(package::Union{Module,String}) :: String
-
-Returns the version of a package, or "master" if the package is not installed.
-
-### Example
-
-```julia
-
-julia> package_version("Genie.jl")
-"v0.23.0"
-"""
-function package_version(package::Union{Module,String}) :: String
-  isa(package, Module) && (package = String(nameof(package)))
-  endswith(package, ".jl") && (package = String(package[1:end-3]))
-  pkg_dict = filter(x -> x.second.name == package, Pkg.dependencies())
-  isempty(pkg_dict) ? "master" : ("v" * string(first(pkg_dict)[2].version))
-end
 
 """
     mutable struct AssetsConfig

src/Genie.jl

@@ -18,13 +18,13 @@ import Logging
 using Reexport
 using Revise
 
+include("Util.jl")
 include("HTTPUtils.jl")
 include("Exceptions.jl")
 include("Repl.jl")
 include("Watch.jl")
 include("Loader.jl")
 include("Secrets.jl")
-include("Util.jl")
 include("FileTemplates.jl")
 include("Toolbox.jl")
 include("Generator.jl")

src/Loader.jl

@@ -91,8 +91,11 @@ Loads .env file if present
 """
 function load_dotenv()
   if isfile(Genie.config.env_file)
-    # DotEnv.load!(Genie.config.env_file; override = true) #TODO: enable this when DotEnv.jl is updated
-    DotEnv.config(; path = Genie.config.env_file, override = true)
+    @static if VersionNumber(Genie.Util.package_version(DotEnv)) >= v"1.0"
+      DotEnv.load!(Genie.config.env_file; override = true)
+    else
+      DotEnv.config(; path = Genie.config.env_file, override = true)
+    end
   end
 
   nothing

src/Util.jl

@@ -1,5 +1,6 @@
 module Util
 
+using Pkg
 import Genie
 
 
@@ -76,4 +77,23 @@ isprecompiling() = ccall(:jl_generating_output, Cint, ()) == 1
 
 const fws = filterwhitespace
 
+"""
+    package_version(package::Union{Module,String}) :: String
+
+Returns the version of a package, or "master" if the package is not installed.
+
+### Example
+
+```julia
+
+julia> package_version("Genie.jl")
+"v0.23.0"
+"""
+function package_version(package::Union{Module,String}) :: String
+  isa(package, Module) && (package = String(nameof(package)))
+  endswith(package, ".jl") && (package = String(package[1:end-3]))
+  pkg_dict = filter(x -> x.second.name == package, Pkg.dependencies())
+  isempty(pkg_dict) ? "master" : ("v" * string(first(pkg_dict)[2].version))
+end
+
 end

test/tests_1_config.jl

@@ -31,7 +31,7 @@
 
     Genie.config.server_port  = 8000
     Genie.config.server_host  = "127.0.0.1"
-    Genie.config.websockets_port = 8000
+    Genie.config.websockets_port = nothing
     Genie.config.run_as_server   = false
 
     down()

test/tests_loader.jl

@@ -7,4 +7,5 @@
     @test get(ENV, "FOO", "") == ""
     Genie.Loader.load_dotenv()
     @test get(ENV, "FOO", "") == "bar"
+    delete!(ENV, "FOO")
 end