Merge pull request #7601 from rubygems/deivid-rodriguez/bundle-help-package

Properly resolve aliases when `bundle help` is run

(cherry picked from commit 34d94ea)

Author: deivid-rodriguez

bundler/lib/bundler/cli.rb

@@ -114,6 +114,8 @@ def cli_help
     class_option "verbose", type: :boolean, desc: "Enable verbose output mode", aliases: "-V"
 
     def help(cli = nil)
+      cli = self.class.all_aliases[cli] if self.class.all_aliases[cli]
+
       case cli
       when "gemfile" then command = "gemfile"
       when nil       then command = "bundle"
@@ -683,7 +685,6 @@ def self.reformatted_help_args(args)
       exec_used = args.index {|a| exec_commands.include? a }
 
       command = args.find {|a| bundler_commands.include? a }
-      command = all_aliases[command] if all_aliases[command]
 
       if exec_used && help_used
         if exec_used + help_used == 1

bundler/spec/commands/help_spec.rb

@@ -15,6 +15,13 @@
     expect(out).to eq(%(["#{man_dir}/bundle-install.1"]))
   end
 
+  it "prexifes bundle commands with bundle- and resolves aliases when finding the man files" do
+    with_fake_man do
+      bundle "help package"
+    end
+    expect(out).to eq(%(["#{man_dir}/bundle-cache.1"]))
+  end
+
   it "simply outputs the human readable file when there is no man on the path" do
     with_path_as("") do
       bundle "help install"