Improve help output and manpage lookup.

Author: trans

lib/executable.rb

@@ -22,7 +22,7 @@ def self.included(base)
 
   #
   # Default initializer, simply takes a hash of settings
-  # to set attributes via writer methods. Not existnt
+  # to set attributes via writer methods. Not existant
   # attributes are simply ignored.
   #
   def initialize(settings={})

lib/executable/dispatch.rb

@@ -2,7 +2,7 @@ module Executable
 
   # Variation of Executable which provides basic compatibility with
   # previous versions of Executable. It provides a call method that
-  # automatically dispatches to publich methods.
+  # automatically dispatches to public methods.
   #
   # Among other uses, Dispatch can be useful for dropping into any class
   # as a quick and dirty way to work with it on the command line.

lib/executable/domain.rb

@@ -3,6 +3,28 @@ module Executable
   #
   module Domain
 
+    #
+    def usage_name
+      list = []
+      ancestors.each do |ancestor|
+        break if Executable == ancestor
+        list.unshift calculate_command_name(ancestor).to_s.strip
+      end
+      list.reject{|n| n.empty?}.join(" ")
+    end
+
+    #
+    def calculate_command_name(ancestor)
+      if ancestor.methods(false).include?(:command_name)
+        command_name.to_s
+      else
+        cname = ancestor.name.sub(/\#\<.*?\>\:\:/,'').split('::').last.downcase
+        cname.chomp('command').chomp('cli')
+      end
+    end
+
+    private :calculate_command_name
+
     #
     # Helper method for creating switch attributes.
     #

lib/executable/help.rb

@@ -63,10 +63,7 @@ def initialize(cli_class)
     # @method name(text=nil)
     #
     section(:name) do
-      str = cli_class.name.sub(/\#\<.*?\>\:\:/,'').downcase.gsub('::','-')
-      str.chomp!('command')
-      str.chomp!('cli')
-      str
+      cli_class.usage_name
     end
 
     #
@@ -122,7 +119,7 @@ def subcommand(name, description)
     #
     # Show help.
     #
-    # @todo man-pages will probably fail on Windows
+    # @todo man-pages will probably fail on Windows.
     #
     def show_help(hint=nil)
       if file = manpage(hint)
@@ -132,6 +129,9 @@ def show_help(hint=nil)
       end
     end
 
+    #
+    alias :show :show_help
+
     #
     def show_manpage(file)
       #exec "man #{file}"
@@ -155,8 +155,10 @@ def manpage(dir=nil)
           dir = File.dirname(file)
         end
 
+        man_name = name.gsub(/\s+/, '-') + '.1'
+
         if dir
-          glob = "man/{man1/,}#{name}.1"
+          glob = "man/{man1/,}#{man_name}"
           lookup(glob, dir)
         else
           nil