Apply help command sort to options, too

Closes #114

.gitignore

@@ -10,3 +10,4 @@ gli.wiki
 Gemfile.lock
 results.html
 .rbx
+.DS_Store

features/todo.feature

@@ -115,10 +115,10 @@ Feature: The todo app has a nice user interface
 
     GLOBAL OPTIONS
         --flag=arg         - (default: none)
-        --help             - Show this message
-        --[no-]otherswitch - 
         --[no-]switch      - 
+        --[no-]otherswitch - 
         --version          - 
+        --help             - Show this message
 
     COMMANDS
         help          - Shows a list of commands or help for one command

lib/gli/app.rb

@@ -224,10 +224,10 @@ def exit_code; 64; end
       raise exception
     end
 
-    # Control how help commands are sorted.  By default, the commands are sorted alphabetically.
+    # Control how commands and options are sorted in help output.  By default, they are sorted alphabetically.
     #
-    # sort_type:: How you want help commands sorted:
-    #             +:manually+:: help commands are ordered in the order declared.
+    # sort_type:: How you want help commands/options sorted:
+    #             +:manually+:: help commands/options are ordered in the order declared.
     #             +:alpha+:: sort alphabetically (default)
     def sort_help(sort_type)
       @help_sort_type = sort_type

lib/gli/commands/help_modules/command_help_format.rb

@@ -16,7 +16,7 @@ def format
           command_wrapper = @wrapper_class.new(Terminal.instance.size[0],4 + @command.name.to_s.size + 3)
           wrapper = @wrapper_class.new(Terminal.instance.size[0],4)
           flags_and_switches = Hash[@command.topmost_ancestor.flags.merge(@command.topmost_ancestor.switches).select { |_,option| option.associated_command == @command }]
-          options_description = OptionsFormatter.new(flags_and_switches,@wrapper_class).format
+          options_description = OptionsFormatter.new(flags_and_switches,@sorter,@wrapper_class).format
           commands_description = format_subcommands(@command)
 
           synopses = []

lib/gli/commands/help_modules/global_help_format.rb

@@ -27,7 +27,7 @@ def format
           command_formatter.output(stringio)
           commands = stringio.string
 
-          global_option_descriptions = OptionsFormatter.new(global_flags_and_switches,@wrapper_class).format
+          global_option_descriptions = OptionsFormatter.new(global_flags_and_switches,@sorter,@wrapper_class).format
 
           GLOBAL_HELP.result(binding)
         end

lib/gli/commands/help_modules/options_formatter.rb

@@ -2,15 +2,15 @@ module GLI
   module Commands
     module HelpModules
       class OptionsFormatter
-        def initialize(flags_and_switches,wrapper_class)
+        def initialize(flags_and_switches,sorter,wrapper_class)
           @flags_and_switches = flags_and_switches
+          @sorter = sorter
           @wrapper_class = wrapper_class
         end
 
         def format
-          list_formatter = ListFormatter.new(@flags_and_switches.values.sort { |a,b| 
-            a.name.to_s <=> b.name.to_s 
-          }.map { |option|
+          flags_and_switches = @sorter.call(@flags_and_switches.values)
+          list_formatter = ListFormatter.new(flags_and_switches.map { |option|
             if option.respond_to? :argument_name
               [option_names_for_help_string(option,option.argument_name),description_with_default(option)]
             else