From 2b7f71edc113d77d38cc81a4619c6daa154d94be Mon Sep 17 00:00:00 2001 From: Pierre Chalamet Date: Fri, 16 Jan 2026 18:36:25 +0100 Subject: [PATCH] rename graph command as console --- Makefile | 2 +- src/Terrabuild/CLI.fs | 6 +++--- src/Terrabuild/Program.fs | 12 ++++++------ src/Terrabuild/Web/GraphServer.fs | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index a59918bb..47d913bf 100644 --- a/Makefile +++ b/Makefile @@ -105,7 +105,7 @@ terrabuild: # ui: webui - $(terrabuild) graph --no-open --port 5179 + $(terrabuild) console --no-open --port 5179 test-scaffold: $(terrabuild) scaffold --workspace tests/scaffold --debug --log diff --git a/src/Terrabuild/CLI.fs b/src/Terrabuild/CLI.fs index 3fcac54c..55d58a9b 100644 --- a/src/Terrabuild/CLI.fs +++ b/src/Terrabuild/CLI.fs @@ -104,7 +104,7 @@ with | Project _ -> "Select projets base on id." [] -type GraphArgs = +type ConsoleArgs = | [] Workspace of path:string | [] No_Open | [] Port of port:int @@ -158,7 +158,7 @@ type TerrabuildArgs = | [] Logs of ParseResults | [] Run of ParseResults | [] Serve of ParseResults - | [] Graph of ParseResults + | [] Console of ParseResults | [] Clear of ParseResults | [] Login of ParseResults | [] Logout of ParseResults @@ -173,7 +173,7 @@ with | Logs _ -> "dump logs." | Run _ -> "Run specified targets." | Serve _ -> "Serve specified targets." - | Graph _ -> "Visualize and build graph in a web UI." + | Console _ -> "Visualize and build graph in a web UI." | Clear _ -> "Clear specified caches." | Login _ -> "Connect to backend." | Logout _ -> "Disconnect from backend." diff --git a/src/Terrabuild/Program.fs b/src/Terrabuild/Program.fs index 0ab1e4dc..ac972d48 100644 --- a/src/Terrabuild/Program.fs +++ b/src/Terrabuild/Program.fs @@ -301,21 +301,21 @@ let processCommandLine (parser: ArgumentParser) (result: ParseRe RunTargetOptions.Engine = None } runTarget options - let graph (graphArgs: ParseResults) = + let console (consoleArgs: ParseResults) = let workspaceResult = - match graphArgs.TryGetResult(GraphArgs.Workspace) with + match consoleArgs.TryGetResult(ConsoleArgs.Workspace) with | Some ws -> findWorkspace (ws |> FS.fullPath) | None -> findWorkspace (currentDir()) match workspaceResult with | None -> - "No workspace found. Start Terrabuild graph from a workspace directory or pass -w ." + "No workspace found. Start console from a workspace directory or pass -w ." |> Terminal.writeLine 5 | Some _ -> - "Press Ctrl+C to exit graph server mode." |> Terminal.writeLine + "Press Ctrl+C to exit console server mode." |> Terminal.writeLine Terminal.flush() Terminal.mute() - GraphServer.start graphArgs (log || debug) debug |> ignore + GraphServer.start consoleArgs (log || debug) debug |> ignore Terminal.unmute() 0 @@ -385,7 +385,7 @@ let processCommandLine (parser: ArgumentParser) (result: ParseRe | p when p.Contains(TerrabuildArgs.Logs) -> p.GetResult(TerrabuildArgs.Logs) |> logs | p when p.Contains(TerrabuildArgs.Run) -> p.GetResult(TerrabuildArgs.Run) |> run | p when p.Contains(TerrabuildArgs.Serve) -> p.GetResult(TerrabuildArgs.Serve) |> serve - | p when p.Contains(TerrabuildArgs.Graph) -> p.GetResult(TerrabuildArgs.Graph) |> graph + | p when p.Contains(TerrabuildArgs.Console) -> p.GetResult(TerrabuildArgs.Console) |> console | p when p.Contains(TerrabuildArgs.Clear) -> p.GetResult(TerrabuildArgs.Clear) |> clear | p when p.Contains(TerrabuildArgs.Login) -> p.GetResult(TerrabuildArgs.Login) |> login | p when p.Contains(TerrabuildArgs.Logout) -> p.GetResult(TerrabuildArgs.Logout) |> logout diff --git a/src/Terrabuild/Web/GraphServer.fs b/src/Terrabuild/Web/GraphServer.fs index f367bbcc..186d8d55 100644 --- a/src/Terrabuild/Web/GraphServer.fs +++ b/src/Terrabuild/Web/GraphServer.fs @@ -305,11 +305,11 @@ let private startBuildProcess (workspace: string) (request: BuildRequest) (logSt Ok proc.Id ) -let start (graphArgs: ParseResults) (logEnabled: bool) (debugEnabled: bool) = +let start (graphArgs: ParseResults) (logEnabled: bool) (debugEnabled: bool) = let workspace = - graphArgs.TryGetResult(CLI.GraphArgs.Workspace) + graphArgs.TryGetResult(CLI.ConsoleArgs.Workspace) |> resolveWorkspace - let shouldOpenBrowser = graphArgs.Contains(GraphArgs.No_Open) |> not + let shouldOpenBrowser = graphArgs.Contains(ConsoleArgs.No_Open) |> not let processDir = System.Environment.ProcessPath |> Option.ofObj @@ -326,7 +326,7 @@ let start (graphArgs: ParseResults) (logEnabled: bool) (debugEnabled: ] |> List.append (processDir |> Option.map (fun dir -> Path.Combine(dir, "ui")) |> Option.toList) |> List.map (fun path -> Path.GetFullPath(path)) - let port = graphArgs.TryGetResult(GraphArgs.Port) |> Option.defaultValue 5179 + let port = graphArgs.TryGetResult(ConsoleArgs.Port) |> Option.defaultValue 5179 let url = $"http://127.0.0.1:{port}" let builder = WebApplication.CreateBuilder() builder.Logging.ClearProviders() |> ignore