admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #3914 from MikeMcQuaid/prune-recursive-test

Browse Source 
deps: don't display recursive test dependencies.
This commit is contained in:
Mike McQuaid 2018-03-16 14:20:47 +00:00 committed by GitHub
commit 13bb2be21f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/cmd/deps.rb
View File

@ -18,7 +18,7 @@
#: By default, `deps` shows required and recommended dependencies for #: By default, `deps` shows required and recommended dependencies for
#: <formulae>. To include the `:build` type dependencies, pass `--include-build`. #: <formulae>. To include the `:build` type dependencies, pass `--include-build`.
#: Similarly, pass `--include-optional` to include `:optional` dependencies or #: Similarly, pass `--include-optional` to include `:optional` dependencies or
#: `--include-test` to include `:test` dependencies. #: `--include-test` to include (non-recursive) `:test` dependencies.
#: To skip `:recommended` type dependencies, pass `--skip-recommended`. #: To skip `:recommended` type dependencies, pass `--skip-recommended`.
#: To include requirements in addition to dependencies, pass `--include-requirements`. #: To include requirements in addition to dependencies, pass `--include-requirements`.
#: #:
@ -145,8 +145,11 @@ module Homebrew
if dep.recommended? if dep.recommended?
Dependency.prune if ignores.include?("recommended?") || dependent.build.without?(dep) Dependency.prune if ignores.include?("recommended?") || dependent.build.without?(dep)
elsif dep.test? elsif dep.test?
next if includes.include?("test?") if includes.include?("test?")
Dependency.prune Dependency.keep_but_prune_recursive_deps
else
Dependency.prune
end
elsif dep.optional? elsif dep.optional?
Dependency.prune if !includes.include?("optional?") && !dependent.build.with?(dep) Dependency.prune if !includes.include?("optional?") && !dependent.build.with?(dep)
elsif dep.build? elsif dep.build?
@ -157,8 +160,7 @@ module Homebrew
if req.recommended? if req.recommended?
Requirement.prune if ignores.include?("recommended?") || dependent.build.without?(req) Requirement.prune if ignores.include?("recommended?") || dependent.build.without?(req)
elsif req.test? elsif req.test?
next if includes.include?("test?") Requirement.prune unless includes.include?("test?")
Requirement.prune
elsif req.optional? elsif req.optional?
Requirement.prune if !includes.include?("optional?") && !dependent.build.with?(req) Requirement.prune if !includes.include?("optional?") && !dependent.build.with?(req)
elsif req.build? elsif req.build?

23
Library/Homebrew/cmd/uses.rb
View File

@ -1,4 +1,4 @@
#: * `uses` [`--installed`] [`--recursive`] [`--include-build`] [`--include-optional`] [`--skip-recommended`] [`--devel`|`--HEAD`] <formulae>: #: * `uses` [`--installed`] [`--recursive`] [`--include-build`] [`--include-test`] [`--include-optional`] [`--skip-recommended`] [`--devel`|`--HEAD`] <formulae>:
#: Show the formulae that specify <formulae> as a dependency. When given #: Show the formulae that specify <formulae> as a dependency. When given
#: multiple formula arguments, show the intersection of formulae that use #: multiple formula arguments, show the intersection of formulae that use
#: <formulae>. #: <formulae>.
@ -9,10 +9,12 @@
#: #:
#: By default, `uses` shows all formulae that specify <formulae> as a required #: By default, `uses` shows all formulae that specify <formulae> as a required
#: or recommended dependency. To include the `:build` type dependencies, pass #: or recommended dependency. To include the `:build` type dependencies, pass
#: `--include-build`. Similarly, pass `--include-optional` to include `:optional` #: `--include-build`, to include the `:test` type dependencies, pass
#: dependencies. To skip `:recommended` type dependencies, pass `--skip-recommended`. #: `--include-test` and to include `:optional` dependencies pass
#: `--include-optional`. To skip `:recommended` type dependencies, pass
#: `--skip-recommended`.
#: #:
#: By default, `uses` shows usages of <formulae> by stable builds. To find #: By default, `uses` shows usage of <formulae> by stable builds. To find
#: cases where <formulae> is used by development or HEAD build, pass #: cases where <formulae> is used by development or HEAD build, pass
#: `--devel` or `--HEAD`. #: `--devel` or `--HEAD`.
@ -47,6 +49,11 @@ module Homebrew
else else
ignores << "build?" ignores << "build?"
end end
if ARGV.include? "--include-test"
includes << "test?"
else
ignores << "test?"
end
if ARGV.include? "--include-optional" if ARGV.include? "--include-optional"
includes << "optional?" includes << "optional?"
else else
@ -61,6 +68,12 @@ module Homebrew
deps = f.recursive_dependencies do |dependent, dep| deps = f.recursive_dependencies do |dependent, dep|
if dep.recommended? if dep.recommended?
Dependency.prune if ignores.include?("recommended?") || dependent.build.without?(dep) Dependency.prune if ignores.include?("recommended?") || dependent.build.without?(dep)
elsif dep.test?
if includes.include?("test?")
Dependency.keep_but_prune_recursive_deps
else
Dependency.prune
end
elsif dep.optional? elsif dep.optional?
Dependency.prune if !includes.include?("optional?") && !dependent.build.with?(dep) Dependency.prune if !includes.include?("optional?") && !dependent.build.with?(dep)
elsif dep.build? elsif dep.build?
@ -89,6 +102,8 @@ module Homebrew
reqs_by_formula.reject! do |dependent, req| reqs_by_formula.reject! do |dependent, req|
if req.recommended? if req.recommended?
ignores.include?("recommended?") || dependent.build.without?(req) ignores.include?("recommended?") || dependent.build.without?(req)
elsif req.test?
Requirement.prune unless includes.include?("test?")
elsif req.optional? elsif req.optional?
!includes.include?("optional?") && !dependent.build.with?(req) !includes.include?("optional?") && !dependent.build.with?(req)
elsif req.build? elsif req.build?

3
Library/Homebrew/dependency.rb
View File

@ -83,6 +83,9 @@ class Dependency
deps.each do |dep| deps.each do |dep|
next if dependent.name == dep.name next if dependent.name == dep.name
# we only care about one level of test dependencies.
next if dep.test? && @expand_stack.length > 1
case action(dependent, dep, &block) case action(dependent, dep, &block)
when :prune when :prune
next next

6
Library/Homebrew/test/dependency_expansion_spec.rb
View File

@ -102,12 +102,12 @@ describe Dependency do
end end
it "keeps dependency but prunes recursive dependencies with ::keep_but_prune_recursive_deps" do it "keeps dependency but prunes recursive dependencies with ::keep_but_prune_recursive_deps" do
foo = build_dep(:foo, [:build], bar) foo = build_dep(:foo, [:test], bar)
baz = build_dep(:baz, [:build]) baz = build_dep(:baz, [:test])
f = double(name: "f", deps: [foo, baz]) f = double(name: "f", deps: [foo, baz])
deps = described_class.expand(f) do |_dependent, dep| deps = described_class.expand(f) do |_dependent, dep|
described_class.keep_but_prune_recursive_deps if dep.build? described_class.keep_but_prune_recursive_deps if dep.test?
end end
expect(deps).to eq([foo, baz]) expect(deps).to eq([foo, baz])

12
docs/Manpage.md
View File

@ -97,7 +97,7 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
By default, `deps` shows required and recommended dependencies for By default, `deps` shows required and recommended dependencies for
`formulae`. To include the `:build` type dependencies, pass `--include-build`. `formulae`. To include the `:build` type dependencies, pass `--include-build`.
Similarly, pass `--include-optional` to include `:optional` dependencies or Similarly, pass `--include-optional` to include `:optional` dependencies or
`--include-test` to include `:test` dependencies. `--include-test` to include (non-recursive) `:test` dependencies.
To skip `:recommended` type dependencies, pass `--skip-recommended`. To skip `:recommended` type dependencies, pass `--skip-recommended`.
To include requirements in addition to dependencies, pass `--include-requirements`. To include requirements in addition to dependencies, pass `--include-requirements`.
@ -565,7 +565,7 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
If `formulae` are given, upgrade only the specified brews (unless they If `formulae` are given, upgrade only the specified brews (unless they
are pinned; see `pin`, `unpin`). are pinned; see `pin`, `unpin`).
* `uses` [`--installed`] [`--recursive`] [`--include-build`] [`--include-optional`] [`--skip-recommended`] [`--devel`|`--HEAD`] `formulae`: * `uses` [`--installed`] [`--recursive`] [`--include-build`] [`--include-test`] [`--include-optional`] [`--skip-recommended`] [`--devel`|`--HEAD`] `formulae`:
Show the formulae that specify `formulae` as a dependency. When given Show the formulae that specify `formulae` as a dependency. When given
multiple formula arguments, show the intersection of formulae that use multiple formula arguments, show the intersection of formulae that use
`formulae`. `formulae`.
@ -576,10 +576,12 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
By default, `uses` shows all formulae that specify `formulae` as a required By default, `uses` shows all formulae that specify `formulae` as a required
or recommended dependency. To include the `:build` type dependencies, pass or recommended dependency. To include the `:build` type dependencies, pass
`--include-build`. Similarly, pass `--include-optional` to include `:optional` `--include-build`, to include the `:test` type dependencies, pass
dependencies. To skip `:recommended` type dependencies, pass `--skip-recommended`. `--include-test` and to include `:optional` dependencies pass
`--include-optional`. To skip `:recommended` type dependencies, pass
`--skip-recommended`.
By default, `uses` shows usages of `formulae` by stable builds. To find By default, `uses` shows usage of `formulae` by stable builds. To find
cases where `formulae` is used by development or HEAD build, pass cases where `formulae` is used by development or HEAD build, pass
`--devel` or `--HEAD`. `--devel` or `--HEAD`.

8
manpages/brew.1
View File

@ -107,7 +107,7 @@ If \fB\-\-full\-name\fR is passed, list dependencies by their full name\.
If \fB\-\-installed\fR is passed, only list those dependencies that are currently installed\. If \fB\-\-installed\fR is passed, only list those dependencies that are currently installed\.
. .
.IP .IP
By default, \fBdeps\fR shows required and recommended dependencies for \fIformulae\fR\. To include the \fB:build\fR type dependencies, pass \fB\-\-include\-build\fR\. Similarly, pass \fB\-\-include\-optional\fR to include \fB:optional\fR dependencies or \fB\-\-include\-test\fR to include \fB:test\fR dependencies\. To skip \fB:recommended\fR type dependencies, pass \fB\-\-skip\-recommended\fR\. To include requirements in addition to dependencies, pass \fB\-\-include\-requirements\fR\. By default, \fBdeps\fR shows required and recommended dependencies for \fIformulae\fR\. To include the \fB:build\fR type dependencies, pass \fB\-\-include\-build\fR\. Similarly, pass \fB\-\-include\-optional\fR to include \fB:optional\fR dependencies or \fB\-\-include\-test\fR to include (non\-recursive) \fB:test\fR dependencies\. To skip \fB:recommended\fR type dependencies, pass \fB\-\-skip\-recommended\fR\. To include requirements in addition to dependencies, pass \fB\-\-include\-requirements\fR\.
. .
.TP .TP
\fBdeps\fR \fB\-\-tree\fR [\fB\-\-1\fR] [\fIfilters\fR] [\fB\-\-annotate\fR] (\fIformulae\fR|\fB\-\-installed\fR) \fBdeps\fR \fB\-\-tree\fR [\fB\-\-1\fR] [\fIfilters\fR] [\fB\-\-annotate\fR] (\fIformulae\fR|\fB\-\-installed\fR)
@ -579,7 +579,7 @@ If \fB\-\-fetch\-HEAD\fR is passed, fetch the upstream repository to detect if t
If \fIformulae\fR are given, upgrade only the specified brews (unless they are pinned; see \fBpin\fR, \fBunpin\fR)\. If \fIformulae\fR are given, upgrade only the specified brews (unless they are pinned; see \fBpin\fR, \fBunpin\fR)\.
. .
.TP .TP
\fBuses\fR [\fB\-\-installed\fR] [\fB\-\-recursive\fR] [\fB\-\-include\-build\fR] [\fB\-\-include\-optional\fR] [\fB\-\-skip\-recommended\fR] [\fB\-\-devel\fR|\fB\-\-HEAD\fR] \fIformulae\fR \fBuses\fR [\fB\-\-installed\fR] [\fB\-\-recursive\fR] [\fB\-\-include\-build\fR] [\fB\-\-include\-test\fR] [\fB\-\-include\-optional\fR] [\fB\-\-skip\-recommended\fR] [\fB\-\-devel\fR|\fB\-\-HEAD\fR] \fIformulae\fR
Show the formulae that specify \fIformulae\fR as a dependency\. When given multiple formula arguments, show the intersection of formulae that use \fIformulae\fR\. Show the formulae that specify \fIformulae\fR as a dependency\. When given multiple formula arguments, show the intersection of formulae that use \fIformulae\fR\.
. .
.IP .IP
@ -589,10 +589,10 @@ Use \fB\-\-recursive\fR to resolve more than one level of dependencies\.
If \fB\-\-installed\fR is passed, only list installed formulae\. If \fB\-\-installed\fR is passed, only list installed formulae\.
. .
.IP .IP
By default, \fBuses\fR shows all formulae that specify \fIformulae\fR as a required or recommended dependency\. To include the \fB:build\fR type dependencies, pass \fB\-\-include\-build\fR\. Similarly, pass \fB\-\-include\-optional\fR to include \fB:optional\fR dependencies\. To skip \fB:recommended\fR type dependencies, pass \fB\-\-skip\-recommended\fR\. By default, \fBuses\fR shows all formulae that specify \fIformulae\fR as a required or recommended dependency\. To include the \fB:build\fR type dependencies, pass \fB\-\-include\-build\fR, to include the \fB:test\fR type dependencies, pass \fB\-\-include\-test\fR and to include \fB:optional\fR dependencies pass \fB\-\-include\-optional\fR\. To skip \fB:recommended\fR type dependencies, pass \fB\-\-skip\-recommended\fR\.
. .
.IP .IP
By default, \fBuses\fR shows usages of \fIformulae\fR by stable builds\. To find cases where \fIformulae\fR is used by development or HEAD build, pass \fB\-\-devel\fR or \fB\-\-HEAD\fR\. By default, \fBuses\fR shows usage of \fIformulae\fR by stable builds\. To find cases where \fIformulae\fR is used by development or HEAD build, pass \fB\-\-devel\fR or \fB\-\-HEAD\fR\.
. .
.TP .TP
\fB\-\-cache\fR \fB\-\-cache\fR