Merge pull request #768 from MikeMcQuaid/cask-man

Make "brew man" also generate Cask's manpage.

.gitignore

@@ -39,6 +39,7 @@
 !/.github
 !/share/doc/homebrew
 !/share/man/man1/brew.1
+!/share/man/man1/brew-cask.1
 
 # Ignore `etc` contents (again)
 /etc

Library/Homebrew/cask/Rakefile

@@ -47,6 +47,5 @@ end
 
 desc "Generate man page from Markdown source"
 task :man do
-  sh "ronn --roff --pipe --organization=Homebrew-Cask --manual=brew-cask " \
+  sh "brew man"
-     "doc/man_page/brew-cask.1.md > man/man1/brew-cask.1"
 end

Library/Homebrew/cmd/man.rb

@@ -37,6 +37,9 @@ module Homebrew
     markup = build_man_page
     convert_man_page(markup, TARGET_DOC_PATH/"brew.1.html")
     convert_man_page(markup, TARGET_MAN_PATH/"brew.1")
+
+    cask_markup = (HOMEBREW_LIBRARY/"Homebrew/cask/doc/man_page/brew-cask.1.md").read
+    convert_man_page(cask_markup, TARGET_MAN_PATH/"brew-cask.1")
   end
 
   def build_man_page
@@ -69,7 +72,7 @@ module Homebrew
     shared_args = %W[
       --pipe
       --organization=Homebrew
-      --manual=brew
+      --manual=#{target.basename(".1")}
     ]
 
     format_flag, format_desc = target_path_to_format(target)

share/man/man1/brew-cask.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BREW\-CASK" "1" "August 2016" "Homebrew-Cask" "brew-cask"
+.TH "BREW\-CASK" "1" "August 2016" "Homebrew" "brew-cask"
 .
 .SH "NAME"
 \fBbrew\-cask\fR \- a friendly binary installer for macOS