updates based on review

Author: KristofferC

docs/src/manual/running.md

@@ -3,12 +3,14 @@
 
 ## Command-Line Launcher
 
-Starting with Julia 1.12, you can launch IJulia directly from the command line using the `ijulia` command. First, you need to install the app entry point by running in the Julia REPL:
+Starting with Julia 1.12, you can launch IJulia directly from the command line using the `ijulia` command. First, you need to install the app entry point (see [Julia app documentation](https://pkgdocs.julialang.org/v1/apps/)) by running in the Julia REPL:
 
 ```julia
 pkg> app add IJulia
 ```
 
+You may need to add `~/.julia/bin` to your PATH if it's not already there.
+
 Then you can use the `ijulia` command from your terminal:
 
 ```bash

src/IJulia.jl

@@ -587,11 +587,8 @@ include("precompile.jl")
 #######################################################################
 # App entry point for `ijulia` command
 
-# Mutable function references for testing - allows tests to mock these functions
-notebook_cmd::Function = notebook
-jupyterlab_cmd::Function = jupyterlab
-
-function (@main)(ARGS)
+@static if VERSION >= v"1.11"
+function (@main)(ARGS; notebook_cmd::Function = notebook, jupyterlab_cmd::Function = jupyterlab)
     # Show help if help flag
     if !isempty(ARGS) && ARGS[1] in ("--help", "-h", "help")
         println("""
@@ -621,8 +618,8 @@ function (@main)(ARGS)
         return 0
     end
 
-    # Parse subcommand (default to "notebook")
-    subcommand = "notebook"
+    # Parse subcommand (default to "lab")
+    subcommand = "lab"
     args_start = 1
     if !isempty(ARGS)
         first_arg = ARGS[1]
@@ -660,7 +657,7 @@ function (@main)(ARGS)
     # Launch the appropriate command
     launch_func = subcommand == "notebook" ? notebook_cmd : jupyterlab_cmd
     try
-        launch_func(Cmd(extra_args); dir=dir, detached=detached, port=port, verbose=verbose)
+        launch_func(Cmd(extra_args); dir, detached, port, verbose)
         return 0
     catch e
         if e isa InterruptException
@@ -671,5 +668,6 @@ function (@main)(ARGS)
         end
     end
 end
+end # if VERSION
 
 end # IJulia

test/main.jl

@@ -33,95 +33,70 @@ import IJulia
     end
 
     # Test argument parsing without actually launching
-    # We use mutable function references (notebook_cmd/jupyterlab_cmd) to test parsing
     @testset "argument parsing" begin
-        # Save original functions
-        orig_notebook = IJulia.notebook_cmd
-        orig_jupyterlab = IJulia.jupyterlab_cmd
-
-        # Test notebook (default)
+        # Test default subcommand (lab)
         called_with = nothing
-        IJulia.notebook_cmd = function(args=``; dir=homedir(), detached=false, port=nothing, verbose=false)
+        mock_jupyterlab = function(args=``; dir=homedir(), detached=false, port=nothing, verbose=false)
             called_with = (; args, dir, detached, port, verbose)
             return nothing
         end
 
-        try
-            ret = IJulia.main(["--dir=/test", "--port=9999", "--detached", "--verbose", "--no-browser"])
-            @test ret == 0
-            @test !isnothing(called_with)
-            @test called_with.dir == "/test"
-            @test called_with.port == 9999
-            @test called_with.detached == true
-            @test called_with.verbose == true
-            @test "--no-browser" in called_with.args
-        finally
-            IJulia.notebook_cmd = orig_notebook
-        end
+        ret = IJulia.main(["--dir=/test", "--port=9999", "--detached", "--verbose", "--no-browser"]; jupyterlab_cmd=mock_jupyterlab)
+        @test ret == 0
+        @test !isnothing(called_with)
+        @test called_with.dir == "/test"
+        @test called_with.port == 9999
+        @test called_with.detached == true
+        @test called_with.verbose == true
+        @test "--no-browser" in called_with.args
 
         # Test explicit notebook subcommand
         called_with = nothing
-        IJulia.notebook_cmd = function(args=``; dir=homedir(), detached=false, port=nothing, verbose=false)
+        mock_notebook = function(args=``; dir=homedir(), detached=false, port=nothing, verbose=false)
             called_with = (; args, dir, detached, port, verbose)
             return nothing
         end
 
-        try
-            ret = IJulia.main(["notebook", "--port=8888"])
-            @test ret == 0
-            @test !isnothing(called_with)
-            @test called_with.port == 8888
-            @test called_with.dir == homedir()
-            @test called_with.detached == false
-        finally
-            IJulia.notebook_cmd = orig_notebook
-        end
+        ret = IJulia.main(["notebook", "--dir=/test", "--port=9999", "--detached", "--verbose", "--no-browser"]; notebook_cmd=mock_notebook)
+        @test ret == 0
+        @test !isnothing(called_with)
+        @test called_with.dir == "/test"
+        @test called_with.port == 9999
+        @test called_with.detached == true
+        @test called_with.verbose == true
+        @test "--no-browser" in called_with.args
 
         # Test lab subcommand
         called_with = nothing
-        IJulia.jupyterlab_cmd = function(args=``; dir=homedir(), detached=false, port=nothing, verbose=false)
+        mock_jupyterlab = function(args=``; dir=homedir(), detached=false, port=nothing, verbose=false)
             called_with = (; args, dir, detached, port, verbose)
             return nothing
         end
 
-        try
-            ret = IJulia.main(["lab", "--dir=/lab", "--verbose"])
-            @test ret == 0
-            @test !isnothing(called_with)
-            @test called_with.dir == "/lab"
-            @test called_with.verbose == true
-        finally
-            IJulia.jupyterlab_cmd = orig_jupyterlab
-        end
+        ret = IJulia.main(["lab", "--dir=/lab", "--verbose"]; jupyterlab_cmd=mock_jupyterlab)
+        @test ret == 0
+        @test !isnothing(called_with)
+        @test called_with.dir == "/lab"
+        @test called_with.verbose == true
     end
 
     # Test InterruptException handling
     @testset "interrupt handling" begin
-        orig_notebook = IJulia.notebook_cmd
-        IJulia.notebook_cmd = function(args=``; kwargs...)
+        mock_notebook = function(args=``; kwargs...)
             throw(InterruptException())
         end
 
-        try
-            ret = IJulia.main([])
-            @test ret == 0  # InterruptException should return 0
-        finally
-            IJulia.notebook_cmd = orig_notebook
-        end
+        ret = IJulia.main(["notebook"]; notebook_cmd=mock_notebook)
+        @test ret == 0  # InterruptException should return 0
     end
 
     # Test error handling
     @testset "error handling" begin
-        orig_notebook = IJulia.notebook_cmd
-        IJulia.notebook_cmd = function(args=``; kwargs...)
+        mock_notebook = function(args=``; kwargs...)
             error("Test error")
         end
 
-        try
-            ret = @test_logs (:error, r"Failed to launch") IJulia.main([])
-            @test ret == 1  # Errors should return 1
-        finally
-            IJulia.notebook_cmd = orig_notebook
-        end
+        ret = @test_logs (:error, r"Failed to launch") IJulia.main(["notebook"]; notebook_cmd=mock_notebook)
+        @test ret == 1  # Errors should return 1
     end
 end

test/runtests.jl

@@ -7,6 +7,10 @@ const TEST_FILES = [
     "inline.jl", "completion.jl", "jsonx.jl"
 ]
 
+if VERSION >= v"1.11"
+    push!(TEST_FILES, "main.jl")
+end
+
 for file in TEST_FILES
     println(file)
     include(file)