choice 0.1.0 → 0.1.1

data/CHANGELOG

@@ -1,2 +1,15 @@
+0.1.1:
+  - Fixed test_option.rb to be self sufficient.
+  - Fix so that long argument with equals sign in it will parse correctly [Justin Bailey]
+  - Added 'defaultize' deprecation warning.  Too much magic can be harmful.
+  - Made Choice::Writer::puts, print, and printf public, can now possibly be used by other Choice classes.
+  - Changed UnknownArgument to UnknownOption (more descriptive)
+  - Added a 'valid' option as per bugtracker request for 'enum.' [Alexis Li]
+  - Change --long=[ARG] optional format to --long[=ARG] but keep around old format just in case.
+  - Added list format to options as per bug tracker suggestion in the format of --long=*LONG [Alexis Li]
+  - Added --long ARG format.  Works with --long [ARG] and --long *ARG and --long [*ARG]
+  - Added :required option which insists an option is present.
+  - Added gamble.rb card game example.
+
 0.1.0:
-  - First release
+  - First release

data/README

@@ -159,6 +159,7 @@ For the quick learners, here's the list:
 * default
 * desc
 * cast
+* valid (takes array)
 * validate (takes regex)
 * filter (takes a block)
 * action (ditto)
@@ -170,10 +171,12 @@ You can define these within your option in any order which pleases you.
 Defines the short switch for an option.  Expected to be a dash and a single
 character.
 
+  short '-s'
+
 === long
 
 Defines the long switch for an option.  Expected to be a double dash followed by
-a string, an equal sign, and another string.  No spaces.
+a string, an equal sign (or a space), and another string.
 
 There are two variants: longs where a parameter is required and longs where a 
 parameter is optional, in which case the value will be +true+ if the option is
@@ -193,17 +196,35 @@ we can do this:
   $ ruby ftpd.rb --debug=1
   debug: 1
 
+  $ ruby ftpd.rb --debug 1
+  debug: 1
+
 *Required*:
   long '--debug=LEVEL'
 
 Assuming the same as above:
 
-  $ ruby ftpd.rb --debug=1
+  $ ruby ftpd.rb --debug 1
   debug: 1
   
   $ ruby ftpd.rb --debug
   <help screen printed>
+
+=== long as array
+
+Often you may wish to allow users the ability to pass in multiple arguments and have
+them all combined into an array.  You can accomplish this by defining a +long+ and
+setting the caps-argument to *ARG.  Like this:
     
+  long '--suit *SUITS'
+
+<tt>Choice.choices.suits</tt> will now return an array.  Here's an example of usage:
+
+  $ ruby --suit hearts clubs
+  suit: ['hearts', 'clubs']
+
+Check out <tt>examples/gamble.rb</tt> for more information on this cool feature.
+
 === default
 
 You can define a default value for your option, if you'd like.  If the option
@@ -220,7 +241,7 @@ will be 'info.'
   $ ftpd.rb
   debug: info
 
-  $ ftpd.rb --debug=warn
+  $ ftpd.rb --debug warn
   debug: warn
 
 === desc
@@ -244,6 +265,8 @@ By default, all members of the <tt>Choice.choices</tt> hash are strings.  If
 you want something different, like an Integer for a port number, you can use 
 the +cast+ statement.
 
+  cast Integer
+
 Currently support +cast+ options:
 
 * Integer
@@ -253,6 +276,22 @@ Currently support +cast+ options:
 
 We'll probably add Date, Time, and DateTime in the future, if people want them.
 
+=== valid
+
+Giving +valid+ an array creates a whitelist of acceptable arguments.
+
+  valid %w[clubs hearts spades diamonds]
+
+If our option is passed anything other than one of the four card suits, the help
+screen will be printed.  It might be a good idea to include acceptable arguments in
+your option's "desc" value.
+
+  $ ruby gamble.rb -s clubs
+  suit: clubs
+
+  $ ruby gamble.rb -s joker
+  <help screen printed>
+
 === validate
 
 The +validate+ statement accepts a regular expression which it will test 
@@ -264,7 +303,7 @@ be printed.  I love ports, so let's stick with that example:
 Of course, 2100 matches this:
 
   $ ruby ftpd.rb -p 2100
-  port: 21000
+  port: 2100
 
 I like dogs.  I wish dogs could be ports.  Alas, Choice knows better (once
 I've told it so):
@@ -297,6 +336,25 @@ You can probably think of better uses.
 A block passed to the +action+ statement will be run if that particular option
 is passed.  See the <tt>--version</tt> example earlier.
 
+=== required options
+
+You can specify an option as being required by passing :required => true to the 
+option definition.  Choice will then print the help screen if this option is
+not present.  Please let your dear users know which options are required.
+
+For example:
+
+  option :card, :required => true do
+    short '-c'
+    long '--card CARD'
+    desc "The card you wish to gamble on.  Required.  Only one, please."
+  end
+
+Then:
+
+  $ ruby gamble.rb
+  <help screen, -c or --card wasn't passed>
+
 == Other options
 
 These statements are purely aesthetic, used to help make your <tt>--help</tt>
@@ -315,21 +373,33 @@ options defined:
 You can pass any string to the +banner+ statement to override what prints.  This
 might be useful if you're into ascii art.
 
+  banner "Usage: ftpd.rb"
+
 === header
 
 The header is what shows up after the banner but before your option definitions
 are printed.  Each header call is a newline.  Check out the example above.
 
+  header "ftp is a harsh and unforgiving protocol."
+
 === separator
 
 As in the example above, you can put separators between options to help display
 the logical groupings of your options.  Or whatever.  
 
+  separator "----"
+
+To get a blank line, rock an empty string:
+
+  separator ''
+
 === footer
 
 The footer is displayed after all your options are displayed.  Nothing new 
 here, works like the other options above.
 
+  footer "That's all there is to it!"
+
 == It looks like poetry
 
 That's it.  Not much, I know.  Maybe this will make handling your command 
@@ -345,3 +415,9 @@ This'll run the unit tests.  Also, if you would, send me a bit of information
 on your platform.  Choice was tested on OS X and RHEL with a 2.4 kernel but who 
 knows.  Thanks a lot.
 
+== Thanks to
+
+For bug reports, patches, and ideas I'd be honored to thank the following:
+
+- Justin Bailey
+- Alexis Li

data/examples/ftpd.rb

@@ -1,4 +1,5 @@
 $:.unshift "../lib"
+$:.unshift "lib"
 require 'choice'
 
 port = 21
@@ -33,6 +34,14 @@ Choice.options do
     desc "The number of connections to allow at once (default 5)"
     default 5
   end
+
+  option :protocol do
+    short '-l'
+    long '--protocol=PROTOCOL'
+    desc "The protocol to use (default ftp)"
+    valid %w[ftp sftp]
+    default 'ftp'
+  end
       
   option :yaml_cfg do
     long '--config=FILE'
@@ -50,7 +59,7 @@ Choice.options do
   
   option :debug do
     short '-d'
-    long '--debug'
+    long '--debug[=LEVEL]'
     desc 'Turn on debugging mode'
   end  
   

data/examples/gamble.rb

@@ -0,0 +1,42 @@
+$:.unshift "../lib"
+$:.unshift "lib"
+require 'choice'
+
+suits = %w[clubs diamonds spades hearts]
+stringed_numerics = (1..13).to_a.map { |a| a.to_s }
+valid_cards = stringed_numerics + %w[jack queen king ace]
+cards = {}
+stringed_numerics.each { |n| cards[n] = n }
+cards.merge!('1' => 'ace', '11' => 'jack', '12' => 'queen', '13' => 'king')
+
+Choice.options do
+  header "Gambling is fun again!  Pick a card and a suit (or two), then see if you win!"
+  header ""
+  header "Options:" 
+  
+  option :suit, :required => true do
+    short '-s'
+    long '--suit *SUITS'
+    desc "The suit you wish to choose.  Required.  You can pass in more than one, even."
+    desc "  Valid suits: #{suits * ' '}"
+    valid suits
+  end
+
+  separator ''
+
+  option :card, :required => true do
+    short '-c'
+    long '--card CARD'
+    desc "The card you wish to gamble on.  Required.  Only one, please."
+    desc "  Valid cards: 1 - 13, jack, queen, king, ace"
+    valid valid_cards
+    cast String
+  end
+end
+
+suit = suits[rand(suits.size)]
+card = cards[(rand(13)+1).to_s]
+
+puts "I drew the #{card} of #{suit}."
+puts "You picked the #{Choice.choices.card} of #{Choice.choices.suit * ' or '}."
+puts "You " << (Choice.choices.suit.include?(suit) && card == cards[Choice.choices.card] ? 'win!' : 'lose :(')

data/lib/choice.rb

@@ -12,20 +12,17 @@ module Choice
     # The main method, which defines the options
     def options(&block)
       # Setup all instance variables
-      @@args    ||= false
+      @@args    ||= ARGV
       @@banner  ||= false
       @@header  ||= Array.new
       @@options ||= Array.new
       @@footer  ||= Array.new
       
-      # Args can be overriden, but shouldn't be
-      self.args = @@args || ARGV
-      
       # Eval the passed block to define the options.
       instance_eval(&block)
 
       # Parse what we've got.
-      parse
+      parse unless parsed?
     end
   
     # Returns a hash representing options passed in via the command line.
@@ -34,10 +31,10 @@ module Choice
     end
   
     # Defines an option.
-    def option(opt, &block)
+    def option(opt, options = {}, &block)
       # Notice: options is maintained as an array of arrays, the first element
       # the option name and the second the option object.
-      @@options << [opt.to_s, Option.new(&block)]
+      @@options << [opt.to_s, Option.new(options, &block)]
     end
     
     # Separators are text displayed by --help within the options block.
@@ -102,7 +99,7 @@ module Choice
       @@args
     end
     
-    # You can choose to not kill the script after the help screen is prtined.
+    # You can choose to not kill the script after the help screen is printed.
     def dont_exit_on_help=(val) #:nodoc:
       @@exit = true
     end

data/lib/choice/option.rb

@@ -6,12 +6,12 @@ module Choice
 
     # Since we define getters/setters on the fly, we need a white list of
     # which to accept.  Here's the list.
-    CHOICES = %w[short long desc default filter action cast validate]
+    CHOICES = %w[short long desc default filter action cast validate valid]
 
     # You can instantiate an option on its own or by passing it a name and
     # a block.  If you give it a block, it will eval() the block and set itself
     # up nicely.
-    def initialize(option = nil, &block)
+    def initialize(options = {}, &block)
       # Here we store the definitions this option contains, to make to_a and
       # to_h easier.
       @choices = []      
@@ -19,9 +19,9 @@ module Choice
       # If we got a block, eval it and set everything up.
       self.instance_eval(&block) if block_given?      
 
-      # This might be going away in the future.  If you pass nothing but a 
-      # name, Option will try and guess what you want.
-      defaultize(option) unless option.nil?      
+      # Is this option required?
+      @required = options[:required] || false
+      @choices << 'required'
     end
        
     # This is the catch all for the getter/setter choices defined in CHOICES.
@@ -52,14 +52,6 @@ module Choice
       @choices << method if args[0] || block_given? unless @choices.index(method)
     end
     
-    # Might be going away soon.  Tries to make some guesses about what you
-    # want if you instantiated Option with a name and no block.
-    def defaultize(option)
-      option = option.to_s
-      short "-#{option[0..0].downcase}"
-      long "--#{option.downcase}=#{option.upcase}"
-    end
-
     # The desc method is slightly special: it stores itself as an array and
     # each subsequent call adds to that array, rather than overwriting it.
     # This is so we can do multi-line descriptions easily.
@@ -78,7 +70,7 @@ module Choice
       return false if @desc.nil?
       true
     end
-    
+
     # Returns Option converted to an array.
     def to_a
       array = []

data/lib/choice/parser.rb

@@ -27,10 +27,11 @@ module Choice
       
       # Define local hashes we're going to use.  choices is where we store
       # the actual values we've pulled from the argument list.
-      hashes, longs, required, validators, choices = {}, {}, {}, {}, {}
+      hashes, longs, required, validators, choices, arrayed = {}, {}, {}, {}, {}, {}
+      hard_required = {}
 
       # We can define these on the fly because they are all so similar.
-      params = %w[short cast filter action default]
+      params = %w[short cast filter action default valid]
       params.each { |param| hashes["#{param}s"] = {} }
 
       # Inspect each option and move its info into our local hashes.
@@ -44,6 +45,9 @@ module Choice
           raise HashExpectedForOption
         end
 
+        # Is this option required?
+        hard_required[name] = true if obj['required']
+
         # Set the local hashes if the value exists on this option object.
         params.each { |param| hashes["#{param}s"][name] = obj[param] if obj[param] }
         
@@ -57,15 +61,36 @@ module Choice
         
         # Parse the long option. If it contains a =, figure out if the 
         # argument is required or optional.  Optional arguments are formed
-        # like [ARG], whereas required are just ARG (in --long=ARG style).
-        if obj['long'] && obj['long'] =~ /=/
-          option, argument = obj['long'].split('=')
+        # like [=ARG], whereas required are just ARG (in --long=ARG style).
+        if obj['long'] && obj['long'] =~ /(=|\[| )/
+          # Save the separator we used, as we're gonna need it, then split
+          sep = $1
+          option, *argument = obj['long'].split(sep)
+
+          # The actual name of the long switch
           longs[name] = option
-          required[name] = true unless argument =~ /^\[(.+)\]$/
+
+          # Preserve the original argument, as it may contain [ or =,
+          # by joining with the character we split on.  Add a [ in front if
+          # we split on that.
+          argument = (sep == '[' ? '[' : '') << Array(argument).join(sep)
+
+          # Do we expect multiple arguments which get turned into an array?
+          arrayed[name] = true if argument =~ /^\[?=?\*(.+)\]?$/
+         
+          # Is this long required or optional?
+          required[name] = true unless argument =~ /^\[=?\*?(.+)\]$/
         elsif obj['long']
+          # We can't have a long as a switch when valid is set -- die.
+          raise ArgumentRequiredWithValid if obj['valid']
+
           # Set without any checking if it's just --long
           longs[name] = obj['long']
         end
+
+        # If we were given a list of valid arguments with 'valid,' this option
+        # is definitely required.
+        required[name] = true if obj['valid']
       end
 
       # Go through the arguments and try to figure out whom they belong to
@@ -81,21 +106,49 @@ module Choice
           value = true if !value || value =~ /^-/
 
           # Add this value to the choices hash with the key of the option's
-          # name.
-          choices[hashes['shorts'].index(arg)] = value
+          # name.  If we expect an array, tack this argument on.
+          name = hashes['shorts'].index(arg)
+          if arrayed[name]
+            choices[name] ||= []
+            choices[name]  += arrayize_arguments(name, args[i+1..-1])
+          else
+            choices[name] = value
+          end
 
-        elsif arg =~ /=/ && longs.value?(arg.split('=')[0])
-          # If we get a long with a = in it, grab it and the argument
-          # passed to it.
-          choices[longs.index(arg.split('=')[0])] = arg.split('=')[1]
+        elsif /^(--[^=]+)=?/ =~ arg && longs.value?($1)
+          # The joke here is we always accept both --long=VALUE and --long VALUE.
+          
+          # Grab values from --long=VALUE format
+          if arg =~ /=/ && longs.value?((longed = arg.split('=')).first)
+            name  = longs.index(longed.shift)
+            value = longed * '='
+            # For the arrayed options.
+            potential_args = args[i+1..-1]
+          else
+            # Grab value otherwise if not in --long=VALUE format.  Assume --long VALUE.
+            name = longs.index(arg)
+            # Value is nil if we don't have a = and the next argument is no good
+            value = args[i+1] =~ /^-/ ? nil : args[i+1] 
+            # For the arrayed options.
+            potential_args = args[i+2..-1]
+          end
 
-        elsif longs.value?(arg)
-          # If we get a long with no =, just set it to true.
-          choices[longs.index(arg)] = true
+          # If we expect an array, tack this argument on.
+          if arrayed[name] && !value.nil?
+            # If this is arrayed and the value isn't nil, set it.
+            choices[name] ||= []
+            choices[name] << value
+            choices[name] += arrayize_arguments(name, potential_args)
+          else
+            # If we set the value to nil, that means nothing was set and we
+            # need to set the value to true.  We'll find out later if that's 
+            # acceptable or not.
+            choices[name] = value.nil? ? true : value
+          end
 
         else
           # If we're here, we have no idea what the passed argument is.  Die.
-          raise UnknownArgument if arg =~ /^-/
+          raise UnknownOption if arg =~ /^-/
 
         end
       end
@@ -108,6 +161,9 @@ module Choice
 
         # Validate the argument if we need to.
         raise ArgumentValidationFails if validators[name] && validators[name] !~ value
+
+        # Make sure the argument is valid
+        raise InvalidArgument unless value.to_a.all? { |v| hashes['valids'][name].include?(v) } if hashes['valids'][name] 
         
         # Cast the argument using the method defined in the constant hash.
         value = value.send(CAST_METHODS[hashes['casts'][name]]) if hashes['casts'].include?(name)
@@ -123,6 +179,11 @@ module Choice
         choices[name] = value
       end
       
+      # Die if we're missing any required arguments
+      hard_required.each do |name, value|
+        raise ArgumentRequired unless choices[name]
+      end
+
       # Home stretch.  Go through all the defaults defined and if a choice
       # does not exist in our choices hash, set its value to the requested
       # default.
@@ -133,13 +194,28 @@ module Choice
       # Return the choices hash.
       choices
     end
+
+  private
+    # Turns trailing command line arguments into an array for an arrayed value
+    def self.arrayize_arguments(name, args)
+      # Go through trailing arguments and suck them in if they don't seem
+      # to have an owner.
+      array = []
+      potential_args = args.dup 
+      until (arg = potential_args.shift) =~ /^-/ || arg.nil?
+        array << arg
+      end
+      array
+    end
     
     # All the possible exceptions this module can raise.
     class ParseError < Exception; end
     class HashExpectedForOption < Exception; end
-    class UnknownArgument < ParseError; end      
+    class UnknownOption < ParseError; end      
     class ArgumentRequired < ParseError; end
     class ValidateExpectsRegexp < ParseError; end
     class ArgumentValidationFails < ParseError; end
+    class InvalidArgument < ParseError; end
+    class ArgumentRequiredWithValid < ParseError; end
   end
 end

data/lib/choice/version.rb

@@ -1,8 +1,8 @@
 module Choice
   module Version #:nodoc:
-    STRING = "0.1.0"
     MAJOR  = 0
     MINOR  = 1
-    TINY   = 0
+    TINY   = 1
+    STRING = [MAJOR, MINOR, TINY] * '.'
   end
-end
+end

data/lib/choice/writer.rb

@@ -148,12 +148,12 @@ module Choice
                end.to_s
         
         # Print it out, with our newly aquired options string.
-        puts "Usage: #{program}" <<  opts
+        puts "Usage: #{program}" << opts
       end
 
       # Figure out the name of this program based on what was run.
       def program
-        if (/(\/|\\)/ =~ $0) then File.basename($0) else $0 end
+        (/(\/|\\)/ =~ $0) ? File.basename($0) : $0
       end
 
       # Set where we print.
@@ -166,6 +166,7 @@ module Choice
         @@target
       end
 
+      public
       # Fake puts
       def puts(str = nil)
         str = '' if str.nil?

data/test/test_choice.rb

@@ -2,11 +2,14 @@ $:.unshift "../lib:lib"
 require 'test/unit'
 require 'choice'
 
+$VERBOSE = nil
+
 class TestChoice < Test::Unit::TestCase
   
   def setup
     Choice.reset
     Choice.dont_exit_on_help = true
+    Choice.send(:class_variable_set, '@@choices', true)
   end
     
   def test_choices
@@ -49,7 +52,6 @@ class TestChoice < Test::Unit::TestCase
   HELP_STRING = ''
   def test_help
     Choice.output_to(HELP_STRING)
-    Choice.args = ['-m', 'lunch', '--help']
     
     Choice.options do
       banner "Usage: choice [-mu]"
@@ -64,10 +66,12 @@ class TestChoice < Test::Unit::TestCase
       
       option :utencil do
         short "-u"
-        long "--utencil=[UTENCIL]"
+        long "--utencil[=UTENCIL]"
         desc "Your favorite eating utencil."
       end
     end
+
+    Choice.args = ['-m', 'lunch', '--help']
     
     help_string = <<-HELP
 Usage: choice [-mu]
@@ -75,7 +79,7 @@ Usage: choice [-mu]
     -m                               Your favorite meal.
 
 And you eat it with...
-    -u, --utencil=[UTENCIL]          Your favorite eating utencil.
+    -u, --utencil[=UTENCIL]          Your favorite eating utencil.
 HELP
 
     assert_equal help_string, HELP_STRING
@@ -84,7 +88,6 @@ HELP
   UNKNOWN_STRING = ''
   def test_unknown_argument
     Choice.output_to(UNKNOWN_STRING)
-    Choice.args = ['-m', 'lunch', '--motorcycles']
     
     Choice.options do
       banner "Usage: choice [-mu]"
@@ -99,10 +102,12 @@ HELP
       
       option :utencil do
         short "-u"
-        long "--utencil=[UTENCIL]"
+        long "--utencil[=UTENCIL]"
         desc "Your favorite eating utencil."
       end
     end
+
+    Choice.args = ['-m', 'lunch', '--motorcycles']
     
     help_string = <<-HELP
 Usage: choice [-mu]
@@ -110,10 +115,45 @@ Usage: choice [-mu]
     -m                               Your favorite meal.
 
 And you eat it with...
-    -u, --utencil=[UTENCIL]          Your favorite eating utencil.
+    -u, --utencil[=UTENCIL]          Your favorite eating utencil.
 HELP
     
     assert_equal help_string, UNKNOWN_STRING
   end
   
-end
+  REQUIRED_STRING = ''
+  def test_required_argument
+    Choice.output_to(REQUIRED_STRING)
+    
+    Choice.options do
+      banner "Usage: choice [-mu]"
+      header ""
+      option :meal, :required => true do
+        short '-m'
+        desc 'Your favorite meal.'
+      end
+      
+      separator ""
+      separator "And you eat it with..."
+      
+      option :utencil do
+        short "-u"
+        long "--utencil[=UTENCIL]"
+        desc "Your favorite eating utencil."
+      end
+    end
+
+    Choice.args = ['-u', 'spork']
+    
+    help_string = <<-HELP
+Usage: choice [-mu]
+
+    -m                               Your favorite meal.
+
+And you eat it with...
+    -u, --utencil[=UTENCIL]          Your favorite eating utencil.
+HELP
+    
+    assert_equal help_string, REQUIRED_STRING
+  end
+end

data/test/test_option.rb

@@ -1,5 +1,6 @@
 $:.unshift "../lib:lib"
 require 'test/unit'
+require 'choice'
 require 'choice/option'
 
 class TestOption < Test::Unit::TestCase
@@ -65,13 +66,6 @@ class TestOption < Test::Unit::TestCase
     assert_block(&@option.action)
   end
   
-  def test_default_option
-    option = Choice::Option.new('port')
-    
-    assert_equal '-p', option.short
-    assert_equal '--port=PORT', option.long
-  end  
-  
   def test_format
     @option = Choice::Option.new do
       validate /^\w+$/
@@ -141,4 +135,4 @@ class TestOption < Test::Unit::TestCase
     assert_equal cast, hash['cast']    
     assert_equal proc { 2 + 2 }.call, hash['filter'].call
   end
-end
+end

data/test/test_parser.rb

@@ -85,7 +85,7 @@ class TestParser < Test::Unit::TestCase
     end
     @options['age'] = Choice::Option.new do
       short '-a'
-      long 'age=[AGE]'
+      long 'age[=AGE]'
       cast Integer
     end
     
@@ -97,6 +97,24 @@ class TestParser < Test::Unit::TestCase
   end
   
   def test_text_optional
+    @options['color'] = Choice::Option.new do
+      short '-c'
+      long '--color[=COLOR]'
+    end
+    
+    args = ['-c']
+    choices = Choice::Parser.parse(@options, args)
+    
+    assert choices['color']
+    
+    color = 'ladyblue'
+    args = ['-c', color]
+    choices = Choice::Parser.parse(@options, args)
+    
+    assert_equal color, choices['color']
+  end
+
+  def test_text_optional_deprecated
     @options['color'] = Choice::Option.new do
       short '-c'
       long '--color=[COLOR]'
@@ -175,8 +193,157 @@ class TestParser < Test::Unit::TestCase
     end
   
     args = ['-c', 'BestOfYanni', '--grace']
-    assert_raise(Choice::Parser::UnknownArgument) do
+    assert_raise(Choice::Parser::UnknownOption) do
+      choices = Choice::Parser.parse(@options, args)
+    end
+  end
+
+  def test_valid
+    @options['suit'] = Choice::Option.new do
+      short '-s'
+      long '--suit=SUIT'
+      valid %w[club diamond spade heart]
+      desc "The suit of your card, sir."
+    end
+
+    suit_good = 'club'
+    suit_bad = 'joker'
+    
+    args = ['-s', suit_bad]
+    assert_raise(Choice::Parser::InvalidArgument) do
+      choices = Choice::Parser.parse(@options, args)
+    end
+
+    args = ['-s', suit_good]
+    choices = Choice::Parser.parse(@options, args)
+    
+    assert_equal suit_good, choices['suit']
+  end
+
+  def test_valid_needs_argument
+    @options['pants'] = Choice::Option.new do
+      short '-p'
+      long '--pants'
+      valid %w[jeans slacks trunks boxers]
+      desc "Your preferred type of pants."
+    end
+    
+    args = ['-p']
+    assert_raise(Choice::Parser::ArgumentRequiredWithValid) do
       choices = Choice::Parser.parse(@options, args)
     end
   end
+
+  def test_long_as_array
+    @options['medium'] = Choice::Option.new do
+      short '-m'
+      long '--medium=*MEDIUM'
+      desc "The medium(s) you like best."
+    end
+
+    mediums = %w[canvas stone steel]
+
+    args = ['-m', mediums.first, '-m',  mediums[1], '-m', mediums.last]
+    choices = Choice::Parser.parse(@options, args)
+    assert_equal mediums, choices['medium']
+
+    args = ['-m', mediums.first, mediums[1], mediums.last]
+    choices = Choice::Parser.parse(@options, args)
+    assert_equal mediums, choices['medium']
+
+    args = ["--medium=#{mediums.first}", "--medium=#{mediums[1]}", "--medium=#{mediums.last}"]
+    choices = Choice::Parser.parse(@options, args)
+    assert_equal mediums, choices['medium']
+
+    args = ["--medium=#{mediums.first}", mediums[1], mediums.last]
+    choices = Choice::Parser.parse(@options, args)
+    assert_equal mediums, choices['medium']
+  end
+
+  def test_long_as_array_optional
+    @options['instruments'] = Choice::Option.new do
+      short '-i'
+      long '--instruments[=*INSTRUMENTS]'
+      desc "Do you like instruments?  Which ones do you like best?"
+    end
+
+    instruments = %w[xylophone guitar piano]
+
+    args = ["--instruments=#{instruments.first}", "--instruments=#{instruments[1]}", 
+            "--instruments=#{instruments.last}"]
+    choices = Choice::Parser.parse(@options, args)
+    assert_equal instruments, choices['instruments']
+
+    args = %w[--instruments]
+    choices = Choice::Parser.parse(@options, args)
+    assert_equal true, choices['instruments']
+  end
+
+  def test_long_as_array_with_valid
+    @options['suits'] = Choice::Option.new do
+      short '-s'
+      long '--suits=*SUITS'
+      valid %w[club diamond spade heart]
+      desc "The suits of your deck, sir."
+    end
+
+    suits = %w[spade heart]
+
+    args = ['-s', suits.first, suits.last]
+    choices = Choice::Parser.parse(@options, args)
+    
+    assert_equal suits, choices['suits']
+    
+    args = ['-s', suits.first, 'notasuit']
+    assert_raise(Choice::Parser::InvalidArgument) do
+      choices = Choice::Parser.parse(@options, args)
+    end
+  end
+
+  def test_long_with_spaces
+    @options['donut'] = Choice::Option.new do
+      short '-d'
+      long '--donut DONUT'
+      desc "Your favorite donut style."
+    end
+
+    donut = 'long-john'
+
+    args = ['--donut', donut]
+    choices = Choice::Parser.parse(@options, args)
+    
+    assert_equal donut, choices['donut']
+  end
+
+  def test_optional_long_with_spaces
+    @options['donut'] = Choice::Option.new do
+      short '-d'
+      long '--donut [DONUT]'
+      desc "Your favorite donut style."
+    end
+
+    donut = 'chocolate'
+
+    args = ['--donut', donut]
+    choices = Choice::Parser.parse(@options, args)
+    assert_equal donut, choices['donut']
+
+    args = ['--donut']
+    choices = Choice::Parser.parse(@options, args)
+    assert_equal true, choices['donut']
+  end
+
+  def test_long_with_spaces_arrayed
+    @options['donuts'] = Choice::Option.new do
+      short '-d'
+      long '--donuts *DONUTS'
+      desc "Your favorite donut styles."
+    end
+
+    donuts = %w[glazed cream-filled]
+
+    args = ['--donuts', donuts.first, donuts.last]
+    choices = Choice::Parser.parse(@options, args)
+    assert_equal donuts, choices['donuts']
+  end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: choice
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-04-30 00:00:00 -07:00
+  version: 0.1.1
+date: 2006-07-22 00:00:00 -07:00
 summary: Choice is a command line option parser.
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Chris Wanstrath
 files: 
@@ -44,6 +45,7 @@ files:
 - test/test_parser.rb
 - test/test_writer.rb
 - examples/ftpd.rb
+- examples/gamble.rb
 test_files: []
 
 rdoc_options: []