Skip to content

Commit 210dda4

Browse files
[skip-changelog] Eliminate empty lines produced by board details -b (#1997)
* Eliminate blank line between required tools row entries * Fix Programmers ID typo and modify tests accordingly * Reduce spacing between "Required tool" columns Splitting the table produced by `board details` after `Platform checksum` resets both the average length and the variance of the following cells, thus reducing the space between entries.
1 parent 76ddec8 commit 210dda4

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

cli/board/details.go

+17-14
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ func (dr detailsResult) String() string {
109109
// ATmega328P (Old Bootloader) cpu=atmega328old
110110
// ATmega168 cpu=atmega168
111111
t := table.New()
112+
tab := table.New()
112113
addIfNotEmpty := func(label, content string) {
113114
if content != "" {
114115
t.AddRow(label, content)
@@ -157,43 +158,45 @@ func (dr detailsResult) String() string {
157158
addIfNotEmpty(tr("Platform checksum:"), details.Platform.Checksum)
158159

159160
t.AddRow() // get some space from above
161+
162+
tab.SetColumnWidthMode(1, table.Average)
160163
for _, tool := range details.ToolsDependencies {
161-
t.AddRow(tr("Required tool:"), tool.Packager+":"+tool.Name, tool.Version)
164+
tab.AddRow(tr("Required tool:"), tool.Packager+":"+tool.Name, tool.Version)
162165
if showFullDetails {
163166
for _, sys := range tool.Systems {
164-
t.AddRow("", tr("OS:"), sys.Host)
165-
t.AddRow("", tr("File:"), sys.ArchiveFilename)
166-
t.AddRow("", tr("Size (bytes):"), fmt.Sprint(sys.Size))
167-
t.AddRow("", tr("Checksum:"), sys.Checksum)
168-
t.AddRow("", tr("URL:"), sys.Url)
169-
t.AddRow() // get some space from above
167+
tab.AddRow("", tr("OS:"), sys.Host)
168+
tab.AddRow("", tr("File:"), sys.ArchiveFilename)
169+
tab.AddRow("", tr("Size (bytes):"), fmt.Sprint(sys.Size))
170+
tab.AddRow("", tr("Checksum:"), sys.Checksum)
171+
tab.AddRow("", tr("URL:"), sys.Url)
172+
tab.AddRow() // get some space from above
170173
}
171174
}
172-
t.AddRow() // get some space from above
173175
}
174176

177+
tab.AddRow() // get some space from above
175178
for _, option := range details.ConfigOptions {
176-
t.AddRow(tr("Option:"), option.OptionLabel, "", option.Option)
179+
tab.AddRow(tr("Option:"), option.OptionLabel, "", option.Option)
177180
for _, value := range option.Values {
178181
green := color.New(color.FgGreen)
179182
if value.Selected {
180-
t.AddRow("",
183+
tab.AddRow("",
181184
table.NewCell(value.ValueLabel, green),
182185
table.NewCell("✔", green),
183186
table.NewCell(option.Option+"="+value.Value, green))
184187
} else {
185-
t.AddRow("",
188+
tab.AddRow("",
186189
value.ValueLabel,
187190
"",
188191
option.Option+"="+value.Value)
189192
}
190193
}
191194
}
192195

193-
t.AddRow(tr("Programmers:"), tr("Id"), tr("Name"))
196+
tab.AddRow(tr("Programmers:"), tr("ID"), tr("Name"))
194197
for _, programmer := range details.Programmers {
195-
t.AddRow("", programmer.GetId(), programmer.GetName())
198+
tab.AddRow("", programmer.GetId(), programmer.GetName())
196199
}
197200

198-
return t.Render()
201+
return t.Render() + tab.Render()
199202
}

internal/integrationtest/board/board_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ func TestBoardDetailsListProgrammersWithoutFlag(t *testing.T) {
326326
for i, l := range split {
327327
lines[i] = strings.Fields(l)
328328
}
329-
require.Contains(t, lines, []string{"Programmers:", "Id", "Name"})
329+
require.Contains(t, lines, []string{"Programmers:", "ID", "Name"})
330330
require.Contains(t, lines, []string{"edbg", "Atmel", "EDBG"})
331331
require.Contains(t, lines, []string{"atmel_ice", "Atmel-ICE"})
332332
require.Contains(t, lines, []string{"sam_ice", "Atmel", "SAM-ICE"})

0 commit comments

Comments
 (0)