Move brew-depstree into brew deps --tree

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

Library/Contributions/brew_bash_completion.sh

@@ -85,7 +85,7 @@ _brew_to_completion()
             ;;
         deps)
             local opts=$(
-                local opts=(--1 --all)
+                local opts=(--1 --all --tree)
                 for o in ${opts[*]}; do
                     [[ "${COMP_WORDS[*]}" =~ "$o" ]] || echo "$o"
                 done

Library/Contributions/examples/brew-depstree.rb

@@ -1,21 +0,0 @@
-require 'formula'
-
-module Homebrew extend self
-  def depstree
-    ARGV.formulae.each do |f|
-      puts f
-      recursive_deps_tree(f, 1)
-      puts
-    end
-  end
-
-private
-  def recursive_deps_tree(formula, level)
-    formula.deps.each do |dep|
-      puts "> "*level+dep
-      recursive_deps_tree(Formula.factory(dep), level+1)
-    end
-  end
-end
-
-Homebrew.depstree

Library/Contributions/manpages/brew.1.md

@@ -72,7 +72,7 @@ For the full command list, see the COMMANDS section.
     If `--no-fetch` is passed, Homebrew will not download <URL> to the cache and
     will thus not add the MD5 to the formula for you.
 
-  * `deps [--1] [-n] [--all]` <formula>:
+  * `deps [--1] [-n] [--tree] [--all]` <formula>:
     Show <formula>'s dependencies.
 
     If `--1` is passed, only show dependencies one level down, instead of
@@ -80,6 +80,8 @@ For the full command list, see the COMMANDS section.
 
     If `-n` is passed, show dependencies in topological order.
 
+    If `--tree` is passed, show dependencies as a tree.
+
     If `--all` is passed, show dependencies for all formulae.
 
   * `diy [--set-name] [--set-version]`:

Library/Homebrew/cmd/deps.rb

@@ -1,11 +1,24 @@
 require 'formula'
 
+def recursive_deps_tree f, level
+  f.deps.each do |dep|
+    puts "> "*level+dep
+    recursive_deps_tree(Formula.factory(dep), level+1)
+  end
+end
+
 module Homebrew extend self
   def deps
     if ARGV.include? '--all'
       Formula.each do |f|
         puts "#{f.name}: #{f.deps*' '}"
       end
+    elsif ARGV.include? '--tree'
+      ARGV.formulae.each do |f|
+        puts f
+        recursive_deps_tree(f, 1)
+        puts
+      end
     else
       all_deps = ARGV.formulae.map{ |f| ARGV.one? ? f.deps : f.recursive_deps }.intersection
       all_deps.sort! unless ARGV.include? "-n"

share/man/man1/brew.1

@@ -81,7 +81,7 @@ If \fB\-\-autotools\fR is passed, create a basic template for an Autotools\-styl
 If \fB\-\-no\-fetch\fR is passed, Homebrew will not download \fIURL\fR to the cache and will thus not add the MD5 to the formula for you\.
 .
 .TP
-\fBdeps [\-\-1] [\-n] [\-\-all]\fR \fIformula\fR
+\fBdeps [\-\-1] [\-n] [\-\-tree] [\-\-all]\fR \fIformula\fR
 Show \fIformula\fR\'s dependencies\.
 .
 .IP
@@ -91,6 +91,9 @@ If \fB\-\-1\fR is passed, only show dependencies one level down, instead of recu
 If \fB\-n\fR is passed, show dependencies in topological order\.
 .
 .IP
+If \fB\-\-tree\fR is passed, show dependencies as a tree\.
+.
+.IP
 If \fB\-\-all\fR is passed, show dependencies for all formulae\.
 .
 .TP