From 0e8457b933f3d56a54a7899ee65665729abd78e1 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 18 Sep 2010 14:21:05 -0400
Subject: options, bullet proof matches for --long-options (effects minor fix)

* fixes issue noted with --sample-search-form (-F) (in the selection of
  webrick (--webserv-webrick))
---
 lib/sisu/v2/options.rb | 66 +++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to 'lib')

diff --git a/lib/sisu/v2/options.rb b/lib/sisu/v2/options.rb
index 94a23590..bff78cd4 100644
--- a/lib/sisu/v2/options.rb
+++ b/lib/sisu/v2/options.rb
@@ -125,39 +125,39 @@ module SiSU_commandline
       unless m.empty?
         m.each do |m|
           case m
-          when /--color-toggle/;                           c=c+'c'
-          when /--configure/;                              c=c+'C' # issue should be CC
-          when /--machine|--middle/;                       c=c+'m'
-          when /--txt|--text|--plaintext/;                 c=c+'t'
-          when /--html/;                                   c=c+'h'
-          when /--epub/;                                   c=c+'e'
-          when /--od[ft]/;                                 c=c+'o'
-          when /--pdf/;                                    c=c+'p'
-          when /--concordance|--wordmap/;                  c=c+'w'
-          when /--manpage/;                                c=c+'i'
-          when /--texinfo/;                                c=c+'I'
-          when /--xhtml/;                                  c=c+'b'
-          when /--xml-sax/;                                c=c+'x'
-          when /--xml-dom/;                                c=c+'X'
-          when /--digest/;                                 c=c+'N'
-          when /--termsheet/;                              c=c+'T'
-          when /--manifest/;                               c=c+'my'
-          when /--sqlite/;                                 c=c+'d'
-          when /--pg|--psql/;                              c=c+'D'
-          when /--remote|--rsync/;                         c=c+'R'
-          when /--scp/;                                    c=c+'r'
-          when /--source/;                                 c=c+'s'
-          when /--sisupod/;                                c=c+'S'
-          when /--git/;                                    c=c+'g'
-          when /--urls/;                                   c=c+'U'
-          when /--zap|--delete/;                           c=c+'Z'
-          when /--sample-search-form/;                     c=c+'F'
-          when /--webserv|--webrick/;                      c=c+'W'
-          when /--maintenance/;                            c=c+'M'
-          when /--verbose[=-]3/;                           c=c+'VM'
-          when /--verbose[=-]2|--Verbose|--VERBOSE/;       c=c+'V'
-          when /--verbose(?:[=-]1)?/;                      c=c+'v'
-          when /--verbose[=-]0|--quiet|--silent/;          c=c+'q'
+          when /^(?:--color-toggle)$/;                     c=c+'c'
+          when /^(?:--configure)$/;                        c=c+'C' # issue should be CC
+          when /^(?:--dal|--machine|--middle)$/;           c=c+'m'
+          when /^(?:--txt|--text|--plaintext)$/;           c=c+'t'
+          when /^(?:--html)$/;                             c=c+'h'
+          when /^(?:--epub)$/;                             c=c+'e'
+          when /^(?:--od[ft])$/;                           c=c+'o'
+          when /^(?:--pdf)$/;                              c=c+'p'
+          when /^(?:--concordance|--wordmap)$/;            c=c+'w'
+          when /^(?:--manpage)$/;                          c=c+'i'
+          when /^(?:--texinfo)$/;                          c=c+'I'
+          when /^(?:--xhtml)$/;                            c=c+'b'
+          when /^(?:--xml-sax)$/;                          c=c+'x'
+          when /^(?:--xml-dom)$/;                          c=c+'X'
+          when /^(?:--digest)$/;                           c=c+'N'
+          when /^(?:--termsheet)$/;                        c=c+'T'
+          when /^(?:--manifest)$/;                         c=c+'my'
+          when /^(?:--sqlite)$/;                           c=c+'d'
+          when /^(?:--pg|--psql)$/;                        c=c+'D'
+          when /^(?:--remote|--rsync)$/;                   c=c+'R'
+          when /^(?:--scp)$/;                              c=c+'r'
+          when /^(?:--source)$/;                           c=c+'s'
+          when /^(?:--sisupod)$/;                          c=c+'S'
+          when /^(?:--git)$/;                              c=c+'g'
+          when /^(?:--urls)$/;                             c=c+'U'
+          when /^(?:--zap|--delete)$/;                     c=c+'Z'
+          when /^(?:--sample-search-form)$/;               c=c+'F'
+          when /^(?:--webserv|--webrick)$/;                c=c+'W'
+          when /^(?:--maintenance)$/;                      c=c+'M'
+          when /^(?:--verbose[=-]3)$/;                     c=c+'VM'
+          when /^(?:--verbose[=-]2|--Verbose|--VERBOSE)$/; c=c+'V'
+          when /^(?:--verbose(?:[=-]1)?)$/;                c=c+'v'
+          when /^(?:--verbose[=-]0|--quiet|--silent)$/;    c=c+'q'
           else @mod << m
           end
         end
-- 
cgit v1.2.3