feat(cli): update the graph arg behavior #1353
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎ 1 Ignored Deployment
|
gsoltis
suggested changes
Jun 9, 2022
gsoltis
suggested changes
Jun 21, 2022
|
@gsoltis updated, thanks for the review! |
gsoltis
approved these changes
Jun 21, 2022
| } | ||
|
|
||
| func (d *graphValue) Set(value string) error { | ||
| if value == _graphNoValue { |
There was a problem hiding this comment.
This feels like an unfortunate hack because of NoOptDefVal appearing as a string in the usage text. Is it possible that we can use pflag.Flagset.Changed instead of this? (I'd much prefer for this to be some sort of sigil value that a user is incapable of inputting.)
(I haven't yet looked into how pflag works so I don't know what is available when.)
Comment on lines
-908
to
-963
| func (r *run) generateDotGraph(taskGraph *dag.AcyclicGraph, outputFilename fs.AbsolutePath) error { | ||
| graphString := string(taskGraph.Dot(&dag.DotOpts{ | ||
| Verbose: true, | ||
| DrawCycles: true, | ||
| })) | ||
| ext := outputFilename.Ext() | ||
| if ext == ".html" { | ||
| f, err := outputFilename.Create() | ||
| if err != nil { | ||
| return fmt.Errorf("error writing graph: %w", err) | ||
| } | ||
| defer f.Close() | ||
| f.WriteString(`<!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <title>Graph</title> | ||
| </head> | ||
| <body> | ||
| <script src="https://cdn.jsdelivr.net/npm/viz.js@2.1.2-pre.1/viz.js"></script> | ||
| <script src="https://cdn.jsdelivr.net/npm/viz.js@2.1.2-pre.1/full.render.js"></script> | ||
| <script>`) | ||
| f.WriteString("const s = `" + graphString + "`.replace(/\\_\\_\\_ROOT\\_\\_\\_/g, \"Root\").replace(/\\[root\\]/g, \"\");new Viz().renderSVGElement(s).then(el => document.body.appendChild(el)).catch(e => console.error(e));") | ||
| f.WriteString(` | ||
| </script> | ||
| </body> | ||
| </html>`) | ||
| r.ui.Output("") | ||
| r.ui.Output(fmt.Sprintf("✔ Generated task graph in %s", ui.Bold(outputFilename.ToString()))) | ||
| if ui.IsTTY { | ||
| if err := browser.OpenBrowser(outputFilename.ToString()); err != nil { | ||
| r.ui.Warn(color.New(color.FgYellow, color.Bold, color.ReverseVideo).Sprintf("failed to open browser. Please navigate to file://%v", filepath.ToSlash(outputFilename.ToString()))) | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
| hasDot := hasGraphViz() | ||
| if hasDot { | ||
| dotArgs := []string{"-T" + ext[1:], "-o", outputFilename.ToString()} | ||
| cmd := exec.Command("dot", dotArgs...) | ||
| cmd.Stdin = strings.NewReader(graphString) | ||
| if err := cmd.Run(); err != nil { | ||
| return fmt.Errorf("could not generate task graphfile %v: %w", outputFilename, err) | ||
| } else { | ||
| r.ui.Output("") | ||
| r.ui.Output(fmt.Sprintf("✔ Generated task graph in %s", ui.Bold(outputFilename.ToString()))) | ||
| } | ||
| } else { | ||
| r.ui.Output("") | ||
| r.ui.Warn(color.New(color.FgYellow, color.Bold, color.ReverseVideo).Sprint(" WARNING ") + color.YellowString(" `turbo` uses Graphviz to generate an image of your\ngraph, but Graphviz isn't installed on this machine.\n\nYou can download Graphviz from https://graphviz.org/download.\n\nIn the meantime, you can use this string output with an\nonline Dot graph viewer.")) | ||
| r.ui.Output("") | ||
| r.ui.Output(graphString) | ||
| } | ||
| return nil | ||
| } | ||
|
|
There was a problem hiding this comment.
🎉 The more things that get removed from run the better our lives will be. This is great!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updates the behavior of the
--graphCLI flag and fixes a few bugs.This PR also:
--graphCLI flagrun.goFixes #1286