Skip to content

Commit 9454d7f

Browse files
mit-mitmit-mit
authored
Small UI tweak (flutter#2412)
1 parent 3e63683 commit 9454d7f

4 files changed

Lines changed: 49 additions & 68 deletions

File tree

‎lib/src/command/outdated.dart‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,14 +243,10 @@ Future<void> _outputHuman(List<_PackageDetails> rows,
243243
rows.where((row) => row.kind == _DependencyKind.transitive);
244244

245245
final formattedRows = <List<_FormattedString>>[
246-
['Package', 'Current', 'Upgradable', 'Resolvable', 'Latest']
246+
['Dependencies', 'Current', 'Upgradable', 'Resolvable', 'Latest']
247247
.map((s) => _format(s, log.bold))
248248
.toList(),
249-
[
250-
directRows.isEmpty
251-
? _raw('dependencies: all up-to-date')
252-
: _format('dependencies', log.bold),
253-
],
249+
[if (directRows.isEmpty) _raw('all up-to-date')],
254250
...await Future.wait(directRows.map(marker)),
255251
if (includeDevDependencies)
256252
[

‎test/outdated/goldens/circular_dependencies.txt‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ Resolving...
1414

1515
$ pub outdated --no-color
1616
Resolving...
17-
Package Current Upgradable Resolvable Latest
18-
dependencies
19-
foo *1.2.3 1.3.0 1.3.0 1.3.0
17+
Dependencies Current Upgradable Resolvable Latest
18+
foo *1.2.3 1.3.0 1.3.0 1.3.0
2019

2120
dev_dependencies: all up-to-date
2221

@@ -26,9 +25,8 @@ To update it, use `pub upgrade`.
2625

2726
$ pub outdated --no-color --mark=none
2827
Resolving...
29-
Package Current Upgradable Resolvable Latest
30-
dependencies
31-
foo 1.2.3 1.3.0 1.3.0 1.3.0
28+
Dependencies Current Upgradable Resolvable Latest
29+
foo 1.2.3 1.3.0 1.3.0 1.3.0
3230

3331
dev_dependencies: all up-to-date
3432

@@ -38,9 +36,8 @@ To update it, use `pub upgrade`.
3836

3937
$ pub outdated --no-color --up-to-date
4038
Resolving...
41-
Package Current Upgradable Resolvable Latest
42-
dependencies
43-
foo *1.2.3 1.3.0 1.3.0 1.3.0
39+
Dependencies Current Upgradable Resolvable Latest
40+
foo *1.2.3 1.3.0 1.3.0 1.3.0
4441

4542
dev_dependencies: all up-to-date
4643

@@ -50,9 +47,8 @@ To update it, use `pub upgrade`.
5047

5148
$ pub outdated --no-color --pre-releases
5249
Resolving...
53-
Package Current Upgradable Resolvable Latest
54-
dependencies
55-
foo *1.2.3 1.3.0 1.3.0 1.3.0
50+
Dependencies Current Upgradable Resolvable Latest
51+
foo *1.2.3 1.3.0 1.3.0 1.3.0
5652

5753
dev_dependencies: all up-to-date
5854

@@ -62,9 +58,8 @@ To update it, use `pub upgrade`.
6258

6359
$ pub outdated --no-color --no-dev-dependencies
6460
Resolving...
65-
Package Current Upgradable Resolvable Latest
66-
dependencies
67-
foo *1.2.3 1.3.0 1.3.0 1.3.0
61+
Dependencies Current Upgradable Resolvable Latest
62+
foo *1.2.3 1.3.0 1.3.0 1.3.0
6863

6964
transitive dependencies: all up-to-date
7065
1 upgradable dependency is locked (in pubspec.lock) to an older version.

‎test/outdated/goldens/mutually_incompatible.txt‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@ Resolving...
2121

2222
$ pub outdated --no-color
2323
Resolving...
24-
Package Current Upgradable Resolvable Latest
25-
dependencies
26-
bar *1.0.0 *1.0.0 *1.0.0 2.0.0
27-
foo *1.0.0 *1.0.0 *1.0.0 2.0.0
24+
Dependencies Current Upgradable Resolvable Latest
25+
bar *1.0.0 *1.0.0 *1.0.0 2.0.0
26+
foo *1.0.0 *1.0.0 *1.0.0 2.0.0
2827

2928
dev_dependencies: all up-to-date
3029

@@ -35,10 +34,9 @@ Newer versions, while available, are not mutually compatible.
3534

3635
$ pub outdated --no-color --mark=none
3736
Resolving...
38-
Package Current Upgradable Resolvable Latest
39-
dependencies
40-
bar 1.0.0 1.0.0 1.0.0 2.0.0
41-
foo 1.0.0 1.0.0 1.0.0 2.0.0
37+
Dependencies Current Upgradable Resolvable Latest
38+
bar 1.0.0 1.0.0 1.0.0 2.0.0
39+
foo 1.0.0 1.0.0 1.0.0 2.0.0
4240

4341
dev_dependencies: all up-to-date
4442

@@ -49,10 +47,9 @@ Newer versions, while available, are not mutually compatible.
4947

5048
$ pub outdated --no-color --up-to-date
5149
Resolving...
52-
Package Current Upgradable Resolvable Latest
53-
dependencies
54-
bar *1.0.0 *1.0.0 *1.0.0 2.0.0
55-
foo *1.0.0 *1.0.0 *1.0.0 2.0.0
50+
Dependencies Current Upgradable Resolvable Latest
51+
bar *1.0.0 *1.0.0 *1.0.0 2.0.0
52+
foo *1.0.0 *1.0.0 *1.0.0 2.0.0
5653

5754
dev_dependencies: all up-to-date
5855

@@ -63,10 +60,9 @@ Newer versions, while available, are not mutually compatible.
6360

6461
$ pub outdated --no-color --pre-releases
6562
Resolving...
66-
Package Current Upgradable Resolvable Latest
67-
dependencies
68-
bar *1.0.0 *1.0.0 *1.0.0 2.0.0
69-
foo *1.0.0 *1.0.0 *1.0.0 2.0.0
63+
Dependencies Current Upgradable Resolvable Latest
64+
bar *1.0.0 *1.0.0 *1.0.0 2.0.0
65+
foo *1.0.0 *1.0.0 *1.0.0 2.0.0
7066

7167
dev_dependencies: all up-to-date
7268

@@ -77,10 +73,9 @@ Newer versions, while available, are not mutually compatible.
7773

7874
$ pub outdated --no-color --no-dev-dependencies
7975
Resolving...
80-
Package Current Upgradable Resolvable Latest
81-
dependencies
82-
bar *1.0.0 *1.0.0 *1.0.0 2.0.0
83-
foo *1.0.0 *1.0.0 *1.0.0 2.0.0
76+
Dependencies Current Upgradable Resolvable Latest
77+
bar *1.0.0 *1.0.0 *1.0.0 2.0.0
78+
foo *1.0.0 *1.0.0 *1.0.0 2.0.0
8479

8580
transitive dependencies: all up-to-date
8681

‎test/outdated/goldens/newer_versions.txt‎

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,16 @@ Resolving...
4242

4343
$ pub outdated --no-color
4444
Resolving...
45-
Package Current Upgradable Resolvable Latest
46-
dependencies
47-
foo *1.2.3 *1.3.0 *2.0.0 3.0.0
45+
Dependencies Current Upgradable Resolvable Latest
46+
foo *1.2.3 *1.3.0 *2.0.0 3.0.0
4847

4948
dev_dependencies
50-
builder *1.2.3 *1.3.0 2.0.0 2.0.0
49+
builder *1.2.3 *1.3.0 2.0.0 2.0.0
5150

5251
transitive dependencies
53-
transitive *1.2.3 *1.3.0 *1.3.0 2.0.0
54-
transitive2 - - 1.0.0 1.0.0
55-
transitive3 - - 1.0.0 1.0.0
52+
transitive *1.2.3 *1.3.0 *1.3.0 2.0.0
53+
transitive2 - - 1.0.0 1.0.0
54+
transitive3 - - 1.0.0 1.0.0
5655

5756
3 upgradable dependencies are locked (in pubspec.lock) to older versions.
5857
To update these dependencies, use `pub upgrade`.
@@ -62,17 +61,16 @@ To update these dependencies, edit pubspec.yaml.
6261

6362
$ pub outdated --no-color --mark=none
6463
Resolving...
65-
Package Current Upgradable Resolvable Latest
66-
dependencies
67-
foo 1.2.3 1.3.0 2.0.0 3.0.0
64+
Dependencies Current Upgradable Resolvable Latest
65+
foo 1.2.3 1.3.0 2.0.0 3.0.0
6866

6967
dev_dependencies
70-
builder 1.2.3 1.3.0 2.0.0 2.0.0
68+
builder 1.2.3 1.3.0 2.0.0 2.0.0
7169

7270
transitive dependencies
73-
transitive 1.2.3 1.3.0 1.3.0 2.0.0
74-
transitive2 - - 1.0.0 1.0.0
75-
transitive3 - - 1.0.0 1.0.0
71+
transitive 1.2.3 1.3.0 1.3.0 2.0.0
72+
transitive2 - - 1.0.0 1.0.0
73+
transitive3 - - 1.0.0 1.0.0
7674

7775
3 upgradable dependencies are locked (in pubspec.lock) to older versions.
7876
To update these dependencies, use `pub upgrade`.
@@ -82,8 +80,7 @@ To update these dependencies, edit pubspec.yaml.
8280

8381
$ pub outdated --no-color --up-to-date
8482
Resolving...
85-
Package Current Upgradable Resolvable Latest
86-
dependencies
83+
Dependencies Current Upgradable Resolvable Latest
8784
bar 1.0.0 1.0.0 1.0.0 1.0.0
8885
foo *1.2.3 *1.3.0 *2.0.0 3.0.0
8986
local_package 0.0.1 0.0.1 0.0.1 0.0.1
@@ -104,17 +101,16 @@ To update these dependencies, edit pubspec.yaml.
104101

105102
$ pub outdated --no-color --pre-releases
106103
Resolving...
107-
Package Current Upgradable Resolvable Latest
108-
dependencies
109-
foo *1.2.3 *1.3.0 *2.0.0 3.0.0
104+
Dependencies Current Upgradable Resolvable Latest
105+
foo *1.2.3 *1.3.0 *2.0.0 3.0.0
110106

111107
dev_dependencies
112-
builder *1.2.3 *1.3.0 *2.0.0 3.0.0-alpha
108+
builder *1.2.3 *1.3.0 *2.0.0 3.0.0-alpha
113109

114110
transitive dependencies
115-
transitive *1.2.3 *1.3.0 *1.3.0 2.0.0
116-
transitive2 - - 1.0.0 1.0.0
117-
transitive3 - - 1.0.0 1.0.0
111+
transitive *1.2.3 *1.3.0 *1.3.0 2.0.0
112+
transitive2 - - 1.0.0 1.0.0
113+
transitive3 - - 1.0.0 1.0.0
118114

119115
3 upgradable dependencies are locked (in pubspec.lock) to older versions.
120116
To update these dependencies, use `pub upgrade`.
@@ -124,12 +120,11 @@ To update these dependencies, edit pubspec.yaml.
124120

125121
$ pub outdated --no-color --no-dev-dependencies
126122
Resolving...
127-
Package Current Upgradable Resolvable Latest
128-
dependencies
129-
foo *1.2.3 *1.3.0 3.0.0 3.0.0
123+
Dependencies Current Upgradable Resolvable Latest
124+
foo *1.2.3 *1.3.0 3.0.0 3.0.0
130125

131126
transitive dependencies
132-
transitive *1.2.3 2.0.0 2.0.0 2.0.0
127+
transitive *1.2.3 2.0.0 2.0.0 2.0.0
133128

134129
2 upgradable dependencies are locked (in pubspec.lock) to older versions.
135130
To update these dependencies, use `pub upgrade`.

0 commit comments

Comments
 (0)