From 1224f56511ab77180bb210eb22b5f0d950e6e171 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 6 Nov 2019 10:20:20 +0000
Subject: [PATCH] deps: refactor weird OpenStruct usage.

---
 Library/Homebrew/cmd/deps.rb | 40 +++++++++++++++---------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/Library/Homebrew/cmd/deps.rb b/Library/Homebrew/cmd/deps.rb
index c89cafd498..8a19f78ae4 100644
--- a/Library/Homebrew/cmd/deps.rb
+++ b/Library/Homebrew/cmd/deps.rb
@@ -61,53 +61,45 @@ module Homebrew
 
     Formulary.enable_factory_cache!
 
-    mode = OpenStruct.new(
-      installed?:  args.installed?,
-      tree?:       args.tree?,
-      all?:        args.all?,
-      topo_order?: args.n?,
-      union?:      args.union?,
-      for_each?:   args.for_each?,
-      recursive?:  !args.send("1?"),
-    )
+    recursive = !args.send("1?")
 
-    if mode.tree?
-      if mode.installed?
-        puts_deps_tree Formula.installed.sort, mode.recursive?
+    if args.tree?
+      if args.installed?
+        puts_deps_tree Formula.installed.sort, recursive
       else
         raise FormulaUnspecifiedError if args.remaining.empty?
 
-        puts_deps_tree ARGV.formulae, mode.recursive?
+        puts_deps_tree ARGV.formulae, recursive
       end
       return
-    elsif mode.all?
-      puts_deps Formula.sort, mode.recursive?
+    elsif args.all?
+      puts_deps Formula.sort, recursive
       return
-    elsif !args.remaining.empty? && mode.for_each?
-      puts_deps ARGV.formulae, mode.recursive?
+    elsif !args.remaining.empty? && args.for_each?
+      puts_deps ARGV.formulae, recursive
       return
     end
 
-    @only_installed_arg = mode.installed? &&
-                          mode.recursive? &&
+    @only_installed_arg = args.installed? &&
+                          recursive &&
                           !args.include_build? &&
                           !args.include_test? &&
                           !args.include_optional? &&
                           !args.skip_recommended?
 
     if args.remaining.empty?
-      raise FormulaUnspecifiedError unless mode.installed?
+      raise FormulaUnspecifiedError unless args.installed?
 
-      puts_deps Formula.installed.sort, mode.recursive?
+      puts_deps Formula.installed.sort, recursive
       return
     end
 
-    all_deps = deps_for_formulae(ARGV.formulae, mode.recursive?, &(mode.union? ? :| : :&))
+    all_deps = deps_for_formulae(ARGV.formulae, recursive, &(args.union? ? :| : :&))
     all_deps = condense_requirements(all_deps)
-    all_deps.select!(&:installed?) if mode.installed?
+    all_deps.select!(&:installed?) if args.installed?
     all_deps.map!(&method(:dep_display_name))
     all_deps.uniq!
-    all_deps.sort! unless mode.topo_order?
+    all_deps.sort! unless args.n?
     puts all_deps
   end