Merge pull request #34 from Arkoniak/33-spacekwargs

space handling (#33)

.gitignore

@@ -3,3 +3,4 @@
 *.jl.mem
 Manifest.toml
 /docs/build/
+extras/

Project.toml

@@ -1,7 +1,7 @@
 name = "MiniLoggers"
 uuid = "93f3dd0f-005d-4452-894a-a31841fa4078"
 authors = ["Andrey Oskin and contributors"]
-version = "0.4.2"
+version = "0.4.3"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

src/minilogger.jl

@@ -238,6 +238,9 @@ function handle_message(logger::MiniLogger, level, message, _module, group, id,
             printwcolor(iob, tsnow(logger.dtformat), c)
         elseif val == "message"
             showmessage(iob, message, logger, logger.mode)
+            if length(kwargs) > 0 && !isempty(message)
+                print(iob, " ")
+            end
 
             iscomma = false
             for (key, val) in kwargs

test/test02_loggerformat.jl

@@ -26,6 +26,33 @@ conts(s, sub) = match(Regex(sub), s) !== nothing
     end
 end
 
+@testset "contracting kwarg values" begin
+    io = IOBuffer()
+    logger = MiniLogger(io = io, format = "{message}")
+    with_logger(logger) do
+        @info "hello" x = 4 y = 2
+        s = String(take!(io))
+        @test s == "hello x = 4, y = 2\n"
+
+        @info "hello"
+        s = String(take!(io))
+        @test s == "hello\n"
+
+        # Due to the way message is generated, it is impossible to make it more natural
+        @info x = 4 y = 2
+        s = String(take!(io))
+        @test s == "4 y = 2\n"
+
+        @info "" x = 4 y = 2
+        s = String(take!(io))
+        @test s == "x = 4, y = 2\n"
+
+        @info "hello" x = 4 " and " y = 2
+        s = String(take!(io))
+        @test s == "hello x = 4 and y = 2\n"
+    end
+end
+
 @testset "squashing" begin
     io = IOBuffer()
     logger = MiniLogger(io = io, format = "{message}")
@@ -95,7 +122,7 @@ end
     y = "asd"
 
     with_logger(logger) do
-        @info "values: " x y
+        @info "values:" x y
 
         s = String(take!(io))
         @test s == "values: x = 1, y = asd\n"
@@ -119,7 +146,7 @@ end
         try
             error("ERROR")
         catch err
-            @error "foo " exception = (err, catch_backtrace())
+            @error "foo" exception = (err, catch_backtrace())
         end
 
         s = String(take!(io))