slop 2.4.0 → 2.4.1

data/CHANGES.md

@@ -1,3 +1,8 @@
+2.4.1 (2011-12-08)
+------------------
+
+* Ensure optional arguments are returned correctly
+
 2.4.0 (2011-11-26)
 ------------------
 

data/Rakefile

@@ -1,3 +1,9 @@
+begin
+  require 'bundler/gem_tasks'
+rescue LoadError
+end
+
+desc 'Run the test suite'
 task :test do
   $:.unshift './test'
   Dir.glob("test/*_test.rb").each { |test| require "./#{test}" }

data/lib/slop.rb

@@ -2,7 +2,7 @@ class Slop
   include Enumerable
 
   # @return [String] The current version string
-  VERSION = '2.4.0'
+  VERSION = '2.4.1'
 
   # Slops standard Error class. All exception classes should
   # inherit from this class
@@ -151,12 +151,18 @@ class Slop
       return if value.nil?
 
       case @argument_type
-      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?
+      when 'array'
+        arg_value(@argument_value)
+      when 'range'
+        arg_value(value_to_range(value))
+      when 'float'
+        arg_value(value.to_s.to_f)
+      when 'string', 'str'
+        arg_value(value.to_s)
+      when 'symbol', 'sym'
+        arg_value(value.to_s.to_sym)
+      when 'integer', 'int'
+        arg_value(value.to_s.to_i)
       else
         value
       end
@@ -222,6 +228,12 @@ class Slop
 
     private
 
+    def arg_value(value)
+      if accepts_optional_argument? || expects_argument?
+        value
+      end
+    end
+
     def value_to_range(value)
       case value.to_s
       when /\A(-?\d+?)(\.\.\.?|-|,)(-?\d+)\z/

data/slop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'slop'
-  s.version = '2.4.0'
+  s.version = '2.4.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

@@ -94,6 +94,9 @@ class OptionTest < TestCase
     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)
+
+    assert_equal 1, option_value(%w/-i 1/, :i, :optional => true, :as => :range)
+    assert_equal nil, option_value(%w/-i/, :i, :optional => true, :as => :range)
   end
 
   test 'ranges' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-26 00:00:00.000000000Z
+date: 2011-12-08 00:00:00.000000000Z
 dependencies: []
 description: A simple DSL for gathering options and parsing the command line
 email: lee@jarvis.co
@@ -17,9 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemtest
 - .gitignore
-- .yardopts
 - CHANGES.md
 - LICENSE
 - README.md
@@ -50,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Option gathering made easy

data/.yardopts

@@ -1,6 +0,0 @@
---hide-void-return
--m markdown
---title "Slop - Option gathering made easy"
-lib/**/*.rb
---no-private
---readme README.md