slop 2.3.0 → 2.3.1

data/CHANGES.md

@@ -1,5 +1,12 @@
-2.3.0
------
+2.3.1 (2011-11-11)
+------------------
+
+* Return `nil` for any options using casting which don't expect arguments (#33)
+* Fix parenthesis warning on 1.8.7 (@shevegen)
+* Ensure long argument is a string before attempting to use `#[]` method on it
+
+2.3.0 (2011-11-04)
+------------------
 
 * Allow flags to have suffixed `=` char for options which accept an argument
 

data/README.md

@@ -89,9 +89,9 @@ end
 Shortcut:
 
 ```ruby
-Slop.parse :help => true do
-      ...
-end
+Slop.new :help => true
+# or
+Slop.new :help
 ```
 
 Parsing
@@ -103,7 +103,7 @@ Slop's pretty good at parsing, let's take a look at what it'll extract for you
 Slop.parse(:multiple_switches => false) do
   on 's', 'server='
   on 'p', 'port=', :as => :integer
-  on 'username=', :matches => /[^a-zA-Z]+$/
+  on 'username=', :matches => /^[a-zA-Z]+$/
   on 'password='
 end
 ```

data/lib/slop.rb

@@ -2,7 +2,7 @@ class Slop
   include Enumerable
 
   # @return [String] The current version string
-  VERSION = '2.3.0'
+  VERSION = '2.3.1'
 
   # Slops standard Error class. All exception classes should
   # inherit from this class
@@ -152,12 +152,12 @@ class Slop
       return if value.nil?
 
       case @argument_type
-      when 'array'; @argument_value
-      when 'range'; value_to_range value
-      when 'float'; value.to_s.to_f
-      when 'string', 'str';  value.to_s
-      when 'symbol', 'sym';  value.to_s.to_sym
-      when 'integer', 'int'; value.to_s.to_i
+      when 'array'; @argument_value unless !expects_argument?
+      when 'range'; value_to_range value unless !expects_argument?
+      when 'float'; value.to_s.to_f unless !expects_argument?
+      when 'string', 'str';  value.to_s unless !expects_argument?
+      when 'symbol', 'sym';  value.to_s.to_sym unless !expects_argument?
+      when 'integer', 'int'; value.to_s.to_i unless !expects_argument?
       else
         value
       end
@@ -1009,14 +1009,14 @@ class Slop
       extras[:optional] = help[0, 1] == '[' && help[-1, 1] == ']'
       extras[:help] = help
     elsif not boolean and long.to_s =~ /\A(?:--?)?[a-zA-Z][a-zA-Z0-9_-]+\=?\z/
-      extras[:argument] = true if long[-1, 1] == '='
+      extras[:argument] = true if long.to_s[-1, 1] == '='
       options.push args.shift.to_s.sub(/\A--?/, '').sub(/\=\z/, '')
     else
       options.push nil
     end
 
     options.push args.first.respond_to?(:to_sym) ? args.shift : nil
-    options.push (@arguments || extras[:argument]) ? true : (args.shift ? true : false)
+    options.push((@arguments || extras[:argument]) ? true : (args.shift ? true : false))
     options.push extras
   end
 end

data/slop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'slop'
-  s.version = '2.3.0'
+  s.version = '2.3.1'
   s.summary = 'Option gathering made easy'
   s.description = 'A simple DSL for gathering options and parsing the command line'
   s.author = 'Lee Jarvis'

data/test/option_test.rb

@@ -87,6 +87,14 @@ class OptionTest < TestCase
     assert_equal 3, option_value(%w/-vvv/, :v, :verbose, :as => :count)
   end
 
+  test 'casting should return nil for optionless arguments' do
+    assert_equal nil, option_value(%w/-i/, :i, :as => :int)
+    assert_equal nil, option_value(%w/-i/, :i, :as => :str)
+    assert_equal nil, option_value(%w/-i/, :i, :as => :float)
+    assert_equal nil, option_value(%w/-i/, :i, :as => :array)
+    assert_equal nil, option_value(%w/-i/, :i, :as => :range)
+  end
+
   test 'ranges' do
     assert_equal (1..10), option_value(%w/-r 1..10/, :r, true, :as => Range)
     assert_equal (1..10), option_value(%w/-r 1-10/, :r, true, :as => Range)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-05 00:00:00.000000000Z
+date: 2011-11-11 00:00:00.000000000Z
 dependencies: []
 description: A simple DSL for gathering options and parsing the command line
 email: lee@jarvis.co