choice 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.1.3:
+  - Added args_of method to retrieve the arguments of an option
+  
 0.1.2:
   - Made validate directive accept block and validate against its boolean value.
   - Created shorthand format for defining options directly with a hash.

data/lib/choice.rb

@@ -111,6 +111,22 @@ module Choice
     @@args
   end
   
+  # Returns the arguments that follow an argument
+  def args_of(opt)
+    args_of_opt = []
+    
+    # Return an array of the arguments between opt and the next option,
+    # which all start with "-"
+    @@args.slice(@@args.index(opt)+1, @@args.length).select do |arg|
+      if arg[0].chr != "-"
+        args_of_opt << arg
+      else
+        break
+      end
+    end
+    args_of_opt
+  end
+  
   # You can choose to not kill the script after the help screen is printed.
   def dont_exit_on_help=(val) #:nodoc:
     @@exit = true

data/lib/choice/parser.rb

@@ -47,13 +47,8 @@ module Choice
         # Set the local hashes if the value exists on this option object.
         params.each { |param| hashes["#{param}s"][name] = obj[param] if obj[param] }
         
-        # If there is a validate statement, save it as a regex.
-        # If it's present but can't pull off a to_s (wtf?), raise an error.
-        validators[name] = case obj['validate']
-                           when Proc then obj['validate']
-                           when Regexp, String then Regexp.new(obj['validate'].to_s)
-                           else raise ValidateExpectsRegexpOrBlock
-                           end if obj['validate'] 
+        # If there is a validate statement, make it a regex or proc.
+        validators[name] = make_validation(obj['validate']) if obj['validate']
         
         # Parse the long option. If it contains a =, figure out if the 
         # argument is required or optional.  Optional arguments are formed
@@ -208,6 +203,17 @@ module Choice
       array
     end
     
+    def make_validation(validation)
+      case validation
+        when Proc then
+          validation
+        when Regexp, String then 
+          Regexp.new(validation.to_s)
+        else 
+          raise ValidateExpectsRegexpOrBlock
+      end
+    end
+    
     # All the possible exceptions this module can raise.
     class ParseError < Exception; end
     class HashExpectedForOption < Exception; end

data/lib/choice/version.rb

@@ -2,7 +2,7 @@ module Choice
   module Version #:nodoc:
     MAJOR  = 0
     MINOR  = 1
-    TINY   = 2
+    TINY   = 3
     STRING = [MAJOR, MINOR, TINY] * '.'
   end
 end

data/test/test_choice.rb

@@ -180,4 +180,52 @@ HELP
     assert_equal ["Tell me about yourself?", ""], Choice.header
     assert_equal ["", "--help This message"], Choice.footer
   end
+  
+  def test_args_of
+    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
+      
+      #cheat! to test --option=
+      option :autowin do
+        short '-a'
+        long '--autowin=PLAYER'
+        desc 'The person who should automatically win every time'
+        desc 'Beware: raises the suspitions of other players'
+      end
+    end
+    
+    args = ["-c", "king", "--suit", "clubs", "diamonds", "spades", "hearts", "--autowin", "Grant"]
+    Choice.args = args
+    assert_equal ["king"], Choice.args_of("-c")
+    assert_equal ["clubs", "diamonds", "spades", "hearts"], Choice.args_of("--suit")
+    assert_equal ["Grant"], Choice.args_of("--autowin")
+  end
 end

metadata

@@ -1,44 +1,37 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: choice
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2006-11-05 00:00:00 -08:00
-summary: Choice is a command line option parser.
-require_paths: 
-- lib
-email: chris@ozmm.org
-homepage: http://choice.rubyforge.org/
-rubyforge_project: 
-description: Choice is a simple little gem for easily defining and parsing command line options with a friendly DSL.
-autorequire: choice
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.1.3
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Chris Wanstrath
+autorequire: choice
+bindir: bin
+cert_chain: []
+
+date: 2009-02-19 00:00:00 -07:00
+default_executable: 
+dependencies: []
+
+description: Choice is a simple little gem for easily defining and parsing command line options with a friendly DSL.
+email: chris@ozmm.org
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - README
 - CHANGELOG
 - LICENSE
 - lib/choice
-- lib/choice.rb
 - lib/choice/lazyhash.rb
 - lib/choice/option.rb
 - lib/choice/parser.rb
 - lib/choice/version.rb
 - lib/choice/writer.rb
+- lib/choice.rb
 - test/test_choice.rb
 - test/test_lazyhash.rb
 - test/test_option.rb
@@ -46,17 +39,31 @@ files:
 - test/test_writer.rb
 - examples/ftpd.rb
 - examples/gamble.rb
-test_files: []
-
+has_rdoc: false
+homepage: http://choice.rubyforge.org/
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: 
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+summary: Choice is a command line option parser.
+test_files: []