Skip to content

Commit 22009a7

Browse files
author
rctr
committed
cmd/list: add --desc flag
1 parent 34ce8e8 commit 22009a7

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

Library/Homebrew/cmd/list.rb

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,29 @@ def run
107107
case json_version(T.unsafe(args).json)
108108
when :v2
109109
output_json_v2
110+
when :v1, :default
111+
output_json_v1
110112
else
111113
legacy_list
112114
end
113115
end
114116

117+
sig { void }
118+
def output_json_v1
119+
raise UsageError, "Cannot specify `--cask` when using `--json=v1`!" if T.unsafe(args).cask?
120+
121+
formulae = if T.unsafe(args).eval_all?
122+
Formula.all(eval_all: true)
123+
elsif args.no_named?
124+
Formula.installed
125+
else
126+
args.named.to_resolved_formulae
127+
end
128+
129+
json = json_info(formulae)
130+
puts JSON.pretty_generate(json)
131+
end
132+
115133
sig { void }
116134
def output_json_v2
117135
formulae = if T.unsafe(args).eval_all?
@@ -132,8 +150,6 @@ def output_json_v2
132150
else
133151
[]
134152
end
135-
elsif T.unsafe(args).cask?
136-
args.no_named? ? Cask::Cask.all(eval_all: true) : args.named.to_casks
137153
elsif T.unsafe(args).formula?
138154
[]
139155
else
@@ -346,8 +362,6 @@ def list_descriptions
346362
else
347363
[]
348364
end
349-
elsif T.unsafe(args).cask?
350-
args.no_named? ? Cask::Cask.all(eval_all: true) : args.named.to_casks
351365
elsif T.unsafe(args).formula?
352366
[]
353367
else

0 commit comments

Comments
 (0)