Skip to content

Commit 1d75870

Browse files
authored
feat: rename graph command as console (#368)
1 parent 452ccf3 commit 1d75870

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ terrabuild:
105105
#
106106

107107
ui: webui
108-
$(terrabuild) graph --no-open --port 5179
108+
$(terrabuild) console --no-open --port 5179
109109

110110
test-scaffold:
111111
$(terrabuild) scaffold --workspace tests/scaffold --debug --log

src/Terrabuild/CLI.fs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ with
104104
| Project _ -> "Select projets base on id."
105105

106106
[<RequireQualifiedAccess>]
107-
type GraphArgs =
107+
type ConsoleArgs =
108108
| [<Unique; AltCommandLine("-w")>] Workspace of path:string
109109
| [<Unique>] No_Open
110110
| [<Unique; Hidden; AltCommandLine("-p")>] Port of port:int
@@ -158,7 +158,7 @@ type TerrabuildArgs =
158158
| [<CliPrefix(CliPrefix.None)>] Logs of ParseResults<LogsArgs>
159159
| [<CliPrefix(CliPrefix.None)>] Run of ParseResults<RunArgs>
160160
| [<CliPrefix(CliPrefix.None)>] Serve of ParseResults<ServeArgs>
161-
| [<CliPrefix(CliPrefix.None)>] Graph of ParseResults<GraphArgs>
161+
| [<CliPrefix(CliPrefix.None)>] Console of ParseResults<ConsoleArgs>
162162
| [<CliPrefix(CliPrefix.None)>] Clear of ParseResults<ClearArgs>
163163
| [<CliPrefix(CliPrefix.None)>] Login of ParseResults<LoginArgs>
164164
| [<CliPrefix(CliPrefix.None)>] Logout of ParseResults<LogoutArgs>
@@ -173,7 +173,7 @@ with
173173
| Logs _ -> "dump logs."
174174
| Run _ -> "Run specified targets."
175175
| Serve _ -> "Serve specified targets."
176-
| Graph _ -> "Visualize and build graph in a web UI."
176+
| Console _ -> "Visualize and build graph in a web UI."
177177
| Clear _ -> "Clear specified caches."
178178
| Login _ -> "Connect to backend."
179179
| Logout _ -> "Disconnect from backend."

src/Terrabuild/Program.fs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -301,21 +301,21 @@ let processCommandLine (parser: ArgumentParser<TerrabuildArgs>) (result: ParseRe
301301
RunTargetOptions.Engine = None }
302302
runTarget options
303303

304-
let graph (graphArgs: ParseResults<GraphArgs>) =
304+
let console (consoleArgs: ParseResults<ConsoleArgs>) =
305305
let workspaceResult =
306-
match graphArgs.TryGetResult(GraphArgs.Workspace) with
306+
match consoleArgs.TryGetResult(ConsoleArgs.Workspace) with
307307
| Some ws -> findWorkspace (ws |> FS.fullPath)
308308
| None -> findWorkspace (currentDir())
309309
match workspaceResult with
310310
| None ->
311-
"No workspace found. Start Terrabuild graph from a workspace directory or pass -w <path>."
311+
"No workspace found. Start console from a workspace directory or pass -w <path>."
312312
|> Terminal.writeLine
313313
5
314314
| Some _ ->
315-
"Press Ctrl+C to exit graph server mode." |> Terminal.writeLine
315+
"Press Ctrl+C to exit console server mode." |> Terminal.writeLine
316316
Terminal.flush()
317317
Terminal.mute()
318-
GraphServer.start graphArgs (log || debug) debug |> ignore
318+
GraphServer.start consoleArgs (log || debug) debug |> ignore
319319
Terminal.unmute()
320320
0
321321

@@ -385,7 +385,7 @@ let processCommandLine (parser: ArgumentParser<TerrabuildArgs>) (result: ParseRe
385385
| p when p.Contains(TerrabuildArgs.Logs) -> p.GetResult(TerrabuildArgs.Logs) |> logs
386386
| p when p.Contains(TerrabuildArgs.Run) -> p.GetResult(TerrabuildArgs.Run) |> run
387387
| p when p.Contains(TerrabuildArgs.Serve) -> p.GetResult(TerrabuildArgs.Serve) |> serve
388-
| p when p.Contains(TerrabuildArgs.Graph) -> p.GetResult(TerrabuildArgs.Graph) |> graph
388+
| p when p.Contains(TerrabuildArgs.Console) -> p.GetResult(TerrabuildArgs.Console) |> console
389389
| p when p.Contains(TerrabuildArgs.Clear) -> p.GetResult(TerrabuildArgs.Clear) |> clear
390390
| p when p.Contains(TerrabuildArgs.Login) -> p.GetResult(TerrabuildArgs.Login) |> login
391391
| p when p.Contains(TerrabuildArgs.Logout) -> p.GetResult(TerrabuildArgs.Logout) |> logout

src/Terrabuild/Web/GraphServer.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,11 +305,11 @@ let private startBuildProcess (workspace: string) (request: BuildRequest) (logSt
305305
Ok proc.Id
306306
)
307307

308-
let start (graphArgs: ParseResults<GraphArgs>) (logEnabled: bool) (debugEnabled: bool) =
308+
let start (graphArgs: ParseResults<ConsoleArgs>) (logEnabled: bool) (debugEnabled: bool) =
309309
let workspace =
310-
graphArgs.TryGetResult(CLI.GraphArgs.Workspace)
310+
graphArgs.TryGetResult(CLI.ConsoleArgs.Workspace)
311311
|> resolveWorkspace
312-
let shouldOpenBrowser = graphArgs.Contains(GraphArgs.No_Open) |> not
312+
let shouldOpenBrowser = graphArgs.Contains(ConsoleArgs.No_Open) |> not
313313
let processDir =
314314
System.Environment.ProcessPath
315315
|> Option.ofObj
@@ -326,7 +326,7 @@ let start (graphArgs: ParseResults<GraphArgs>) (logEnabled: bool) (debugEnabled:
326326
]
327327
|> List.append (processDir |> Option.map (fun dir -> Path.Combine(dir, "ui")) |> Option.toList)
328328
|> List.map (fun path -> Path.GetFullPath(path))
329-
let port = graphArgs.TryGetResult(GraphArgs.Port) |> Option.defaultValue 5179
329+
let port = graphArgs.TryGetResult(ConsoleArgs.Port) |> Option.defaultValue 5179
330330
let url = $"http://127.0.0.1:{port}"
331331
let builder = WebApplication.CreateBuilder()
332332
builder.Logging.ClearProviders() |> ignore

0 commit comments

Comments
 (0)