Skip to content

Commit ba5385f

Browse files
committed
[breaking] remove board details <fqbn> in favour of board details -b <fqbn>
1 parent 08a5162 commit ba5385f

File tree

3 files changed

+34
-63
lines changed

3 files changed

+34
-63
lines changed

cli/board/details.go

+2-7
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ func initDetailsCommand() *cobra.Command {
4444
Short: tr("Print details about a board."),
4545
Long: tr("Show information about a board, in particular if the board has options to be specified in the FQBN."),
4646
Example: " " + os.Args[0] + " board details -b arduino:avr:nano",
47-
Args: cobra.MaximumNArgs(1),
47+
Args: cobra.NoArgs,
4848
Run: runDetailsCommand,
4949
}
5050

5151
fqbn.AddToCommand(detailsCommand)
5252
detailsCommand.Flags().BoolVarP(&showFullDetails, "full", "f", false, tr("Show full board details"))
5353
detailsCommand.Flags().BoolVarP(&listProgrammers, "list-programmers", "", false, tr("Show list of available programmers"))
54-
// detailsCommand.MarkFlagRequired("fqbn") // enable once `board details <fqbn>` is removed
54+
detailsCommand.MarkFlagRequired("fqbn")
5555

5656
return detailsCommand
5757
}
@@ -61,11 +61,6 @@ func runDetailsCommand(cmd *cobra.Command, args []string) {
6161

6262
logrus.Info("Executing `arduino-cli board details`")
6363

64-
// remove once `board details <fqbn>` is removed
65-
if fqbn.GetFQBN() == "" && len(args) > 0 {
66-
fqbn.SetFQBN(args[0])
67-
}
68-
6964
res, err := board.Details(context.Background(), &rpc.BoardDetailsRequest{
7065
Instance: inst,
7166
Fqbn: fqbn.GetFQBN(),

i18n/data/en.po

+31-31
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,11 @@ msgstr "Board Name"
227227
msgid "Board found: %s"
228228
msgstr "Board found: %s"
229229

230-
#: cli/board/details.go:124
230+
#: cli/board/details.go:119
231231
msgid "Board name:"
232232
msgstr "Board name:"
233233

234-
#: cli/board/details.go:126
234+
#: cli/board/details.go:121
235235
msgid "Board version:"
236236
msgstr "Board version:"
237237

@@ -361,7 +361,7 @@ msgstr "Checking previous results for {0} (result = {1}, dep = {2})"
361361
msgid "Checksum differs from checksum in package.json"
362362
msgstr "Checksum differs from checksum in package.json"
363363

364-
#: cli/board/details.go:172
364+
#: cli/board/details.go:167
365365
msgid "Checksum:"
366366
msgstr "Checksum:"
367367

@@ -500,7 +500,7 @@ msgstr "Debug interpreter e.g.: %s"
500500
msgid "Debugging not supported for board %s"
501501
msgstr "Debugging not supported for board %s"
502502

503-
#: cli/board/details.go:128
503+
#: cli/board/details.go:123
504504
msgid "Debugging supported:"
505505
msgstr "Debugging supported:"
506506

@@ -762,7 +762,7 @@ msgstr "Error getting Debug info: %v"
762762
msgid "Error getting absolute path of sketch archive"
763763
msgstr "Error getting absolute path of sketch archive"
764764

765-
#: cli/board/details.go:75
765+
#: cli/board/details.go:70
766766
msgid "Error getting board details: %v"
767767
msgstr "Error getting board details: %v"
768768

@@ -1014,7 +1014,7 @@ msgstr "Expected compiled sketch in directory %s, but is a file instead"
10141014
msgid "FQBN"
10151015
msgstr "FQBN"
10161016

1017-
#: cli/board/details.go:125
1017+
#: cli/board/details.go:120
10181018
msgid "FQBN:"
10191019
msgstr "FQBN:"
10201020

@@ -1062,7 +1062,7 @@ msgstr "Failed to read: {0}"
10621062
msgid "Failed uploading"
10631063
msgstr "Failed uploading"
10641064

1065-
#: cli/board/details.go:170
1065+
#: cli/board/details.go:165
10661066
msgid "File:"
10671067
msgstr "File:"
10681068

@@ -1134,12 +1134,12 @@ msgstr "Global variables use {0} bytes of dynamic memory."
11341134
msgid "ID"
11351135
msgstr "ID"
11361136

1137-
#: cli/board/details.go:97
1138-
#: cli/board/details.go:198
1137+
#: cli/board/details.go:92
1138+
#: cli/board/details.go:193
11391139
msgid "Id"
11401140
msgstr "Id"
11411141

1142-
#: cli/board/details.go:139
1142+
#: cli/board/details.go:134
11431143
msgid "Identification properties:"
11441144
msgstr "Identification properties:"
11451145

@@ -1478,7 +1478,7 @@ msgstr "Monitor port settings:"
14781478
msgid "Multiple libraries were found for \"{0}\""
14791479
msgstr "Multiple libraries were found for \"{0}\""
14801480

1481-
#: cli/board/details.go:198
1481+
#: cli/board/details.go:193
14821482
#: cli/core/list.go:84
14831483
#: cli/core/search.go:114
14841484
#: cli/lib/list.go:125
@@ -1567,11 +1567,11 @@ msgstr "Not found: {0}"
15671567
msgid "Not used: {0}"
15681568
msgstr "Not used: {0}"
15691569

1570-
#: cli/board/details.go:169
1570+
#: cli/board/details.go:164
15711571
msgid "OS:"
15721572
msgstr "OS:"
15731573

1574-
#: cli/board/details.go:133
1574+
#: cli/board/details.go:128
15751575
msgid "Official Arduino board:"
15761576
msgstr "Official Arduino board:"
15771577

@@ -1580,7 +1580,7 @@ msgstr "Official Arduino board:"
15801580
msgid "Open a communication port with a board."
15811581
msgstr "Open a communication port with a board."
15821582

1583-
#: cli/board/details.go:181
1583+
#: cli/board/details.go:176
15841584
msgid "Option:"
15851585
msgstr "Option:"
15861586

@@ -1628,23 +1628,23 @@ msgstr "Overwrite existing config file."
16281628
msgid "PACKAGER"
16291629
msgstr "PACKAGER"
16301630

1631-
#: cli/board/details.go:149
1631+
#: cli/board/details.go:144
16321632
msgid "Package URL:"
16331633
msgstr "Package URL:"
16341634

1635-
#: cli/board/details.go:148
1635+
#: cli/board/details.go:143
16361636
msgid "Package maintainer:"
16371637
msgstr "Package maintainer:"
16381638

1639-
#: cli/board/details.go:147
1639+
#: cli/board/details.go:142
16401640
msgid "Package name:"
16411641
msgstr "Package name:"
16421642

1643-
#: cli/board/details.go:151
1643+
#: cli/board/details.go:146
16441644
msgid "Package online help:"
16451645
msgstr "Package online help:"
16461646

1647-
#: cli/board/details.go:150
1647+
#: cli/board/details.go:145
16481648
msgid "Package website:"
16491649
msgstr "Package website:"
16501650

@@ -1688,31 +1688,31 @@ msgstr "Platform '%s' not found"
16881688
msgid "Platform ID"
16891689
msgstr "Platform ID"
16901690

1691-
#: cli/board/details.go:157
1691+
#: cli/board/details.go:152
16921692
msgid "Platform URL:"
16931693
msgstr "Platform URL:"
16941694

1695-
#: cli/board/details.go:156
1695+
#: cli/board/details.go:151
16961696
msgid "Platform architecture:"
16971697
msgstr "Platform architecture:"
16981698

1699-
#: cli/board/details.go:155
1699+
#: cli/board/details.go:150
17001700
msgid "Platform category:"
17011701
msgstr "Platform category:"
17021702

1703-
#: cli/board/details.go:162
1703+
#: cli/board/details.go:157
17041704
msgid "Platform checksum:"
17051705
msgstr "Platform checksum:"
17061706

1707-
#: cli/board/details.go:158
1707+
#: cli/board/details.go:153
17081708
msgid "Platform file name:"
17091709
msgstr "Platform file name:"
17101710

1711-
#: cli/board/details.go:154
1711+
#: cli/board/details.go:149
17121712
msgid "Platform name:"
17131713
msgstr "Platform name:"
17141714

1715-
#: cli/board/details.go:160
1715+
#: cli/board/details.go:155
17161716
msgid "Platform size (bytes):"
17171717
msgstr "Platform size (bytes):"
17181718

@@ -1759,11 +1759,11 @@ msgstr "Prints the current configuration."
17591759
msgid "Programmer '%s' not found"
17601760
msgstr "Programmer '%s' not found"
17611761

1762-
#: cli/board/details.go:97
1762+
#: cli/board/details.go:92
17631763
msgid "Programmer name"
17641764
msgstr "Programmer name"
17651765

1766-
#: cli/board/details.go:198
1766+
#: cli/board/details.go:193
17671767
msgid "Programmers:"
17681768
msgstr "Programmers:"
17691769

@@ -1793,7 +1793,7 @@ msgstr "Removes one or more values from a setting."
17931793
msgid "Replacing %[1]s with %[2]s"
17941794
msgstr "Replacing %[1]s with %[2]s"
17951795

1796-
#: cli/board/details.go:166
1796+
#: cli/board/details.go:161
17971797
msgid "Required tool:"
17981798
msgstr "Required tool:"
17991799

@@ -1946,7 +1946,7 @@ msgstr "Shows the version number of Arduino CLI which is installed on your syste
19461946
msgid "Shows version number of Arduino CLI."
19471947
msgstr "Shows version number of Arduino CLI."
19481948

1949-
#: cli/board/details.go:171
1949+
#: cli/board/details.go:166
19501950
msgid "Size (bytes):"
19511951
msgstr "Size (bytes):"
19521952

@@ -2096,7 +2096,7 @@ msgstr "Type"
20962096
msgid "Types: %s"
20972097
msgstr "Types: %s"
20982098

2099-
#: cli/board/details.go:173
2099+
#: cli/board/details.go:168
21002100
msgid "URL:"
21012101
msgstr "URL:"
21022102

test/test_board.py

+1-25
Original file line numberDiff line numberDiff line change
@@ -502,37 +502,13 @@ def test_board_details(run_command):
502502
assert result["debugging_supported"] is True
503503

504504

505-
# old `arduino-cli board details` did not need -b <fqbn> flag to work
506-
def test_board_details_old(run_command):
507-
run_command(["core", "update-index"])
508-
# Download samd core pinned to 1.8.6
509-
run_command(["core", "install", "arduino:[email protected]"])
510-
result = run_command(["board", "details", "arduino:samd:nano_33_iot", "--format", "json"])
511-
assert result.ok
512-
# Sort everything before compare
513-
result = json.loads(result.stdout)
514-
gold_board_details = json.loads(gold_board)
515-
516-
assert result["fqbn"] == gold_board_details["fqbn"]
517-
assert result["name"] == gold_board_details["name"]
518-
assert result["version"] == gold_board_details["version"]
519-
assert result["properties_id"] == gold_board_details["properties_id"]
520-
assert result["official"] == gold_board_details["official"]
521-
assert result["package"] == gold_board_details["package"]
522-
assert result["platform"] == gold_board_details["platform"]
523-
for usb_id in gold_board_details["identification_properties"]:
524-
assert usb_id in result["identification_properties"]
525-
for programmer in gold_board_details["programmers"]:
526-
assert programmer in result["programmers"]
527-
528-
529505
def test_board_details_no_flags(run_command):
530506
run_command(["core", "update-index"])
531507
# Download samd core pinned to 1.8.6
532508
run_command(["core", "install", "arduino:[email protected]"])
533509
result = run_command(["board", "details"])
534510
assert not result.ok
535-
assert "Error getting board details: Invalid FQBN:" in result.stderr
511+
assert "Error: required flag(s) \"fqbn\" not set" in result.stderr
536512
assert result.stdout == ""
537513

538514

0 commit comments

Comments
 (0)