Refactor Dependency.expand

1 files changed, 24 insertions, 18 deletions

diff --git a/Library/Homebrew/dependency.rb b/Library/Homebrew/dependency.rb
index 6c78e10ac..d87d74ccf 100644
--- a/Library/Homebrew/dependency.rb
+++ b/Library/Homebrew/dependency.rb
@@ -54,29 +54,35 @@ class Dependency
     tags << 'universal' if to_formula.build.has_option? 'universal'
   end
 
-  # Expand the dependencies of dependent recursively, optionally yielding
-  # [dependent, dep] pairs to allow callers to apply arbitrary filters to
-  # the list.
-  # The default filter, which is applied when a block is not given, omits
-  # optionals and recommendeds based on what the dependent has asked for.
-  def self.expand(dependent, &block)
-    dependent.deps.map do |dep|
-      prune = catch(:prune) do
+  class << self
+    # Expand the dependencies of dependent recursively, optionally yielding
+    # [dependent, dep] pairs to allow callers to apply arbitrary filters to
+    # the list.
+    # The default filter, which is applied when a block is not given, omits
+    # optionals and recommendeds based on what the dependent has asked for.
+    def expand(dependent, &block)
+      dependent.deps.map do |dep|
+        if prune?(dependent, dep, &block)
+          next
+        else
+          expand(dep.to_formula, &block) << dep
+        end
+      end.flatten.compact.uniq
+    end
+
+    def prune?(dependent, dep, &block)
+      catch(:prune) do
         if block_given?
           yield dependent, dep
         elsif dep.optional? || dep.recommended?
-          Dependency.prune unless dependent.build.with?(dep.name)
+          prune unless dependent.build.with?(dep.name)
         end
       end
+    end
 
-      next if prune
-
-      expand(dep.to_formula, &block) << dep
-    end.flatten.compact.uniq
-  end
-
-  # Used to prune dependencies when calling expand with a block.
-  def self.prune
-    throw(:prune, true)
+    # Used to prune dependencies when calling expand with a block.
+    def prune
+      throw(:prune, true)
+    end
   end
 end