Possible fix for the subcommand help messages using the klass name instead of command name

lib/thor.rb

@@ -454,7 +454,11 @@ def find_command_possibilities(meth)
 
     def subcommand_help(cmd)
       desc "help [COMMAND]", "Describe subcommands or one specific subcommand"
-      class_eval <<-RUBY
+      class_eval <<-RUBY 
+        @subcommand_name = "#{cmd.to_s}"
+        def self.subcommand_name()
+          @subcommand_name
+        end
         def help(command = nil, subcommand = true); super; end
       RUBY
     end

lib/thor/command.rb

@@ -45,7 +45,8 @@ def formatted_usage(klass, namespace = true, subcommand = false)
         namespace = klass.namespace
         formatted = "#{namespace.gsub(/^(default)/,'')}:"
       end
-      formatted = "#{klass.namespace.split(':').last} " if subcommand
+
+      formatted = (klass.respond_to? :subcommand_name) ? "#{klass.subcommand_name} " : "#{klass.namespace.split(':').last} " if subcommand
 
       formatted ||= ""
 

spec/base_spec.rb

@@ -192,7 +192,7 @@ def hello
     it "returns tracked subclasses, grouped by the files they come from" do
       thorfile = File.join(File.dirname(__FILE__), "fixtures", "script.thor")
       expect(Thor::Base.subclass_files[File.expand_path(thorfile)]).to eq([
-        MyScript, MyScript::AnotherScript, MyChildScript, Barn,
+        MyScript, MyScript::AnotherScript, MyChildScript, BarnCli,
         PackageNameScript, Scripts::MyScript, Scripts::MyDefaults,
         Scripts::ChildDefault, Scripts::Arities
       ])

spec/fixtures/script.thor

@@ -145,7 +145,7 @@ class MyChildScript < MyScript
   remove_command :boom, :undefine => true
 end
 
-class Barn < Thor
+class BarnCli < Thor
   desc "open [ITEM]", "open the barn door"
   def open(item = nil)
     if item == "shotgun"
@@ -192,7 +192,7 @@ module Scripts
     end
 
     desc "barn", "commands to manage the barn"
-    subcommand "barn", Barn
+    subcommand "barn", BarnCli
   end
 
   class ChildDefault < Thor

spec/register_spec.rb

@@ -157,7 +157,7 @@ def say
       begin
         $thor_runner = false
         help_output = capture(:stdout) { BoringVendorProvidedCLI.start(%w[exciting]) }
-        expect(help_output).to include('thor exciting_plugin_c_l_i fireworks')
+        expect(help_output).to include('thor exciting fireworks')
       ensure
         $thor_runner = true
       end

spec/subcommand_spec.rb

@@ -6,7 +6,7 @@
 
     it "maps a given subcommand to another Thor subclass" do
       barn_help = capture(:stdout) { Scripts::MyDefaults.start(%w[barn]) }
-      expect(barn_help).to include("barn help [COMMAND]  # Describe subcommands or one specific subcommand")
+      expect(barn_help).to include("thor barn help [COMMAND]  # Describe subcommands or one specific subcommand")
     end
 
     it "passes commands to subcommand classes" do