choice 0.1.5 → 0.1.6

data/CHANGELOG

@@ -1,5 +1,5 @@
 0.1.4:
-  - Monkeypatch to Hash for #index deprecation. Only applied on RUBY_VERSION >= "1.9"
+  - 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.
 

data/lib/choice.rb

@@ -81,8 +81,13 @@ module Choice
       val = class_variable_get(variable) || ''
       class_variable_set(variable, val << string)
     end
-  end
 
+    if RUBY_VERSION > "1.9"
+      original_method = "original_#{method}" 
+      alias_method original_method, method
+      eval "def #{method}(string=nil); #{original_method}(string); end"
+    end
+  end
   
   # Parse the provided args against the defined options.
   def parse #:nodoc:

data/lib/choice/parser.rb

@@ -165,7 +165,7 @@ module Choice
         end
 
         # Make sure the argument is valid
-        raise InvalidArgument unless value.to_a.all? { |v| hashes['valids'][name].include?(v) } if hashes['valids'][name] 
+        raise InvalidArgument unless Array(value).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)

data/lib/choice/version.rb

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

data/test/test_choice.rb

@@ -9,7 +9,7 @@ class TestChoice < Test::Unit::TestCase
   def setup
     Choice.reset!
     Choice.dont_exit_on_help = true
-    Choice.send(:class_variable_set, '@@choices', true)
+    Choice.send(:class_variable_set, '@@choices', {})
   end
     
   def test_choices
@@ -49,7 +49,7 @@ class TestChoice < Test::Unit::TestCase
   end
 
   def test_failed_parse
-    assert Hash.new, Choice.parse
+    assert_equal nil, Choice.parse
   end
 
   HELP_STRING = ''

metadata

@@ -1,33 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: choice
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.1.6
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 5
-  version: 0.1.5
 platform: ruby
-authors: 
+authors:
 - Chris Wanstrath
 autorequire: choice
 bindir: bin
 cert_chain: []
-
-date: 2012-01-25 00:00:00 -07:00
-default_executable: 
+date: 2012-03-26 00:00:00.000000000 Z
 dependencies: []
-
-description: Choice is a simple little gem for easily defining and parsing command line options with a friendly DSL.
+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: 
+files:
 - README.rdoc
 - CHANGELOG
 - LICENSE
@@ -44,39 +34,28 @@ files:
 - test/test_writer.rb
 - examples/ftpd.rb
 - examples/gamble.rb
-has_rdoc: true
 homepage: http://choice.rubyforge.org/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Choice is a command line option parser.
 test_files: []
-