choice 0.1.4 → 0.1.5

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.1.4:
+  - Monkeypatch to Hash for #index deprecation. Only applied on RUBY_VERSION >= "1.9"
+  - Fixed rake file for README filename change
+  - Fixed a broken test that's been broken since 2009.
+
 0.1.3:
   - Added args_of method to retrieve the arguments of an option
   

data/lib/choice.rb

@@ -4,6 +4,12 @@ require 'choice/parser'
 require 'choice/writer'
 require 'choice/lazyhash'
 
+if RUBY_VERSION < "1.9"
+  class Hash
+    alias_method(:key, :index) unless method_defined?(:key)
+  end
+end
+
 #
 # Usage of this module is lovingly detailed in the README file.
 #

data/lib/choice/parser.rb

@@ -105,7 +105,7 @@ module Choice
 
           # Add this value to the choices hash with the key of the option's
           # name.  If we expect an array, tack this argument on.
-          name = hashes['shorts'].index(arg)
+          name = hashes['shorts'].key(arg)
           if arrayed[name]
             choices[name] ||= []
             choices[name] << value unless value.nil?
@@ -119,7 +119,7 @@ module Choice
           
           # Grab values from --long=VALUE format
           name, value = arg.split('=', 2)
-          name = longs.index(name)
+          name = longs.key(name)
           
           if value.nil? && args.first !~ /^-/
             # Grab value otherwise if not in --long=VALUE format.  Assume --long VALUE.
@@ -178,7 +178,11 @@ module Choice
         
         # Now that we've done all that, re-set the element of the choice hash
         # with the (potentially) new value.
-        choices[name] = value
+        if arrayed[name] && choices[name].empty?
+          choices[name] = true
+        else
+          choices[name] = value
+        end
       end
       
       # Die if we're missing any required arguments

data/lib/choice/version.rb

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

data/test/test_parser.rb

@@ -7,7 +7,7 @@ class TestParser < Test::Unit::TestCase
   def setup
     @options = {}
   end
-
+  
   def test_parse_options
     @options['band'] = Choice::Option.new do
       short '-b'
@@ -20,36 +20,36 @@ class TestParser < Test::Unit::TestCase
       long '--animal=ANIMAL'
       cast String
       desc 'Your favorite animal.'
-    end
+    end      
     band = 'Led Zeppelin'
     animal = 'Reindeer'
-
+    
     args = ['-b', band, "--animal=#{animal}"]
-
+          
     choices, rest = Choice::Parser.parse(@options, args)
-
+    
     assert_equal band, choices['band']
     assert_equal animal, choices['animal']
   end
-
+  
   def test_parse_no_options
     assert_equal Hash.new, Choice::Parser.parse(nil, nil)
   end
-
+  
   def test_parse_default
     @options['soda'] = Choice::Option.new do
       short '-s'
       long '--soda=SODA'
       default 'PibbJr'
     end
-
+    
     args = []
-
+    
     choices, rest = Choice::Parser.parse(@options, args)
-
+    
     assert_equal 'PibbJr', choices['soda']
   end
-
+  
   def test_parse_options_with_filters
     @options['host'] = Choice::Option.new do
       short '-h'
@@ -57,27 +57,27 @@ class TestParser < Test::Unit::TestCase
         opt.gsub!(/[^\w]/, '')
         opt = opt.sub(/k/, 'c')
       end
-    end
+    end     
     host = 'de.fun.kt'
     args = ['-h', host]
     choices, rest = Choice::Parser.parse(@options, args)
-
+    
     assert_equal 'defunct', choices['host']
-  end
-
+  end 
+  
   def test_casting
     @options['port'] = Choice::Option.new do
       short '-p'
       cast Integer
     end
-
+    
     port = '3000'
     args = ['-p', port]
     choices, rest = Choice::Parser.parse(@options, args)
-
+    
     assert_equal port.to_i, choices['port']
   end
-
+  
   def test_text_required
     @options['name'] = Choice::Option.new do
       short '-n'
@@ -88,29 +88,29 @@ class TestParser < Test::Unit::TestCase
       long 'age[=AGE]'
       cast Integer
     end
-
+    
     args = ['-n', '-a', '21']
-
+    
     assert_raise(Choice::Parser::ArgumentRequired) do
       choices, rest = Choice::Parser.parse(@options, args)
     end
   end
-
+  
   def test_text_optional
     @options['color'] = Choice::Option.new do
       short '-c'
       long '--color[=COLOR]'
     end
-
+    
     args = ['-c']
     choices, rest = Choice::Parser.parse(@options, args)
-
+    
     assert choices['color']
-
+    
     color = 'ladyblue'
     args = ['-c', color]
     choices, rest = Choice::Parser.parse(@options, args)
-
+    
     assert_equal color, choices['color']
   end
 
@@ -119,38 +119,38 @@ class TestParser < Test::Unit::TestCase
       short '-c'
       long '--color=[COLOR]'
     end
-
+    
     args = ['-c']
     choices, rest = Choice::Parser.parse(@options, args)
-
+    
     assert choices['color']
-
+    
     color = 'ladyblue'
     args = ['-c', color]
     choices, rest = Choice::Parser.parse(@options, args)
-
+    
     assert_equal color, choices['color']
   end
-
+  
   def test_ignore_separator
     options = []
     options << ['keyboard', Choice::Option.new do
       short '-k'
       long '--keyboard=BOARD'
     end]
-
+    
     options << ['mouse', Choice::Option.new do
       short '-m'
       long '--mouse=MOUSE'
     end]
-
+    
     args = ['-m', 'onebutton']
     choices, rest = Choice::Parser.parse([options.first, '----', options.last], args)
-
+    
     assert choices['mouse']
     assert_equal 1, choices.size
   end
-
+  
   def test_long_as_switch
     @options['chunky'] = Choice::Option.new do
       short '-b'
@@ -159,10 +159,10 @@ class TestParser < Test::Unit::TestCase
 
     args = ['--bacon']
     choices, rest = Choice::Parser.parse(@options, args)
-
+    
     assert choices['chunky']
   end
-
+  
   def test_validate_regexp
     @options['email'] = Choice::Option.new do
       short '-e'
@@ -171,9 +171,9 @@ class TestParser < Test::Unit::TestCase
       validate /^[a-z0-9_.-]+@[a-z0-9_.-]+\.[a-z]{2,4}$/i
     end
 
-    email_bad = 'this will@neverwork'
+    email_bad = 'this will@neverwork'    
     email_good = 'chris@ozmm.org'
-
+    
     args = ['-e', email_bad]
     assert_raise(Choice::Parser::ArgumentValidationFails) do
       choices, rest = Choice::Parser.parse(@options, args)
@@ -181,10 +181,10 @@ class TestParser < Test::Unit::TestCase
 
     args = ['-e', email_good]
     choices, rest = Choice::Parser.parse(@options, args)
-
+    
     assert_equal email_good, choices['email']
   end
-
+  
   def test_validate_block
     @options['file'] = Choice::Option.new do
       short '-f'
@@ -197,7 +197,7 @@ class TestParser < Test::Unit::TestCase
 
     file_bad = 'not_a_file.rb'
     file_good = __FILE__
-
+    
     args = ['-f', file_bad]
     assert_raise(Choice::Parser::ArgumentValidationFails) do
       choices, rest = Choice::Parser.parse(@options, args)
@@ -205,7 +205,7 @@ class TestParser < Test::Unit::TestCase
 
     args = ['-f', file_good]
     choices, rest = Choice::Parser.parse(@options, args)
-
+    
     assert_equal file_good, choices['file']
   end
 
@@ -215,7 +215,7 @@ class TestParser < Test::Unit::TestCase
       long '--cd=CD'
       desc 'A CD you like.'
     end
-
+  
     args = ['-c', 'BestOfYanni', '--grace']
     assert_raise(Choice::Parser::UnknownOption) do
       choices, rest = Choice::Parser.parse(@options, args)
@@ -232,7 +232,7 @@ class TestParser < Test::Unit::TestCase
 
     suit_good = 'club'
     suit_bad = 'joker'
-
+    
     args = ['-s', suit_bad]
     assert_raise(Choice::Parser::InvalidArgument) do
       choices, rest = Choice::Parser.parse(@options, args)
@@ -240,7 +240,7 @@ class TestParser < Test::Unit::TestCase
 
     args = ['-s', suit_good]
     choices, rest = Choice::Parser.parse(@options, args)
-
+    
     assert_equal suit_good, choices['suit']
   end
 
@@ -251,7 +251,7 @@ class TestParser < Test::Unit::TestCase
       valid %w[jeans slacks trunks boxers]
       desc "Your preferred type of pants."
     end
-
+    
     args = ['-p']
     assert_raise(Choice::Parser::ArgumentRequiredWithValid) do
       choices, rest = Choice::Parser.parse(@options, args)
@@ -293,15 +293,14 @@ class TestParser < Test::Unit::TestCase
 
     instruments = %w[xylophone guitar piano]
 
-    args = ["--instruments=#{instruments.first}",
-            "--instruments=#{instruments[1]}",
+    args = ["--instruments=#{instruments.first}", "--instruments=#{instruments[1]}", 
             "--instruments=#{instruments.last}"]
     choices, rest = Choice::Parser.parse(@options, args)
     assert_equal instruments, choices['instruments']
 
     args = %w[--instruments]
     choices, rest = Choice::Parser.parse(@options, args)
-    assert_equal [], choices['instruments']
+    assert_equal true, choices['instruments']
   end
 
   def test_long_as_array_with_valid
@@ -316,9 +315,9 @@ class TestParser < Test::Unit::TestCase
 
     args = ['-s', suits.first, suits.last]
     choices, rest = Choice::Parser.parse(@options, args)
-
+    
     assert_equal suits, choices['suits']
-
+    
     args = ['-s', suits.first, 'notasuit']
     assert_raise(Choice::Parser::InvalidArgument) do
       choices, rest = Choice::Parser.parse(@options, args)
@@ -336,7 +335,7 @@ class TestParser < Test::Unit::TestCase
 
     args = ['--donut', donut]
     choices, rest = Choice::Parser.parse(@options, args)
-
+    
     assert_equal donut, choices['donut']
   end
 
@@ -371,7 +370,7 @@ class TestParser < Test::Unit::TestCase
     choices, rest = Choice::Parser.parse(@options, args)
     assert_equal donuts, choices['donuts']
   end
-
+  
   def test_long_with_rest
     @options['donut'] = Choice::Option.new do
       short '-d'

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: choice
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  hash: 17
+  prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +15,7 @@ autorequire: choice
 bindir: bin
 cert_chain: []
 
-date: 2009-10-03 00:00:00 -07:00
+date: 2012-01-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -22,7 +28,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- README
+- README.rdoc
 - CHANGELOG
 - LICENSE
 - lib/choice/lazyhash.rb
@@ -48,21 +54,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Choice is a command line option parser.