From 6d0c6d0604f4e93920491851479776c9a8f5516e Mon Sep 17 00:00:00 2001 From: hyuraku <32809703+hyuraku@users.noreply.github.com> Date: Thu, 27 Jan 2022 15:34:04 +0900 Subject: [PATCH 1/4] ignore dependencies of build-time-dependency --- Library/Homebrew/dependency.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Library/Homebrew/dependency.rb b/Library/Homebrew/dependency.rb index aa5375112..65bc7d02c 100644 --- a/Library/Homebrew/dependency.rb +++ b/Library/Homebrew/dependency.rb @@ -124,6 +124,7 @@ class Dependency expanded_deps << dep else next if @expand_stack.include? dep.name + next if dep.tags.include?(:build) expanded_deps.concat(expand(dep.to_formula, cache_key: cache_key, ignore_missing: ignore_missing, &block)) expanded_deps << dep From e3f42e6f8994ae318571d6d075ecf2ef1eb4a7ba Mon Sep 17 00:00:00 2001 From: hyuraku <32809703+hyuraku@users.noreply.github.com> Date: Thu, 10 Feb 2022 00:29:39 +0900 Subject: [PATCH 2/4] repair CaskDependent#runtime_dependencies --- Library/Homebrew/cask_dependent.rb | 7 ++----- Library/Homebrew/dependency.rb | 1 - Library/Homebrew/installed_dependents.rb | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Library/Homebrew/cask_dependent.rb b/Library/Homebrew/cask_dependent.rb index 88c97c8df..73d0eb311 100644 --- a/Library/Homebrew/cask_dependent.rb +++ b/Library/Homebrew/cask_dependent.rb @@ -17,11 +17,8 @@ class CaskDependent @cask.full_name end - def runtime_dependencies(ignore_missing: false) - recursive_dependencies(ignore_missing: ignore_missing).reject do |dependency| - tags = dependency.tags - tags.include?(:build) || tags.include?(:test) - end + def runtime_dependencies + deps.map { |deps| [deps, deps.to_formula.runtime_dependencies] }.flatten.uniq end def deps diff --git a/Library/Homebrew/dependency.rb b/Library/Homebrew/dependency.rb index 65bc7d02c..aa5375112 100644 --- a/Library/Homebrew/dependency.rb +++ b/Library/Homebrew/dependency.rb @@ -124,7 +124,6 @@ class Dependency expanded_deps << dep else next if @expand_stack.include? dep.name - next if dep.tags.include?(:build) expanded_deps.concat(expand(dep.to_formula, cache_key: cache_key, ignore_missing: ignore_missing, &block)) expanded_deps << dep diff --git a/Library/Homebrew/installed_dependents.rb b/Library/Homebrew/installed_dependents.rb index a0dabc58b..7977dea71 100644 --- a/Library/Homebrew/installed_dependents.rb +++ b/Library/Homebrew/installed_dependents.rb @@ -51,7 +51,7 @@ module InstalledDependents dependent.missing_dependencies(hide: keg_names) when Cask::Cask # When checking for cask dependents, we don't care about missing or non-runtime dependencies - CaskDependent.new(dependent).runtime_dependencies(ignore_missing: true).map(&:to_formula) + CaskDependent.new(dependent).runtime_dependencies.map(&:to_formula) end required_kegs = required.map do |f| From 8aa4cfb155e5f10a9ec21ffae46809f31cca94b4 Mon Sep 17 00:00:00 2001 From: hyuraku <32809703+hyuraku@users.noreply.github.com> Date: Tue, 15 Feb 2022 23:24:33 +0900 Subject: [PATCH 3/4] repair style --- Library/Homebrew/cask_dependent.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/cask_dependent.rb b/Library/Homebrew/cask_dependent.rb index 73d0eb311..9cad6a06f 100644 --- a/Library/Homebrew/cask_dependent.rb +++ b/Library/Homebrew/cask_dependent.rb @@ -18,7 +18,7 @@ class CaskDependent end def runtime_dependencies - deps.map { |deps| [deps, deps.to_formula.runtime_dependencies] }.flatten.uniq + deps.flat_map { |dep| [dep, dep.to_formula.runtime_dependencies] }.uniq end def deps From 9f50a95203366fbf38076a66a38668c0b2613c13 Mon Sep 17 00:00:00 2001 From: hyuraku <32809703+hyuraku@users.noreply.github.com> Date: Wed, 16 Feb 2022 18:59:58 +0900 Subject: [PATCH 4/4] change deps.to_formula.runtime_dependencies to variable length arguments --- Library/Homebrew/cask_dependent.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/cask_dependent.rb b/Library/Homebrew/cask_dependent.rb index 9cad6a06f..e1f3f6bd3 100644 --- a/Library/Homebrew/cask_dependent.rb +++ b/Library/Homebrew/cask_dependent.rb @@ -18,7 +18,7 @@ class CaskDependent end def runtime_dependencies - deps.flat_map { |dep| [dep, dep.to_formula.runtime_dependencies] }.uniq + deps.flat_map { |dep| [dep, *dep.to_formula.runtime_dependencies] }.uniq end def deps