slop 1.3.0 → 1.3.1

data/lib/slop.rb

@@ -218,6 +218,7 @@ private
 
         if option.expects_argument? || option.accepts_optional_argument?
           argument ||= items.at(items.index(item) + 1)
+          check_valid_argument(option, argument)
           trash << argument
 
           if argument
@@ -242,6 +243,13 @@ private
     items
   end
 
+  def check_valid_argument(option, argument)
+    if !option.accepts_optional_argument? && argument =~ /\A--?.+\z/
+      raise MissingArgumentError,
+        "'#{option.key}' expects an argument, none given"
+    end
+  end
+
   def check_matching_argument(option, argument)
     if option.match && !argument.match(option.match)
       raise InvalidArgumentError,

data/lib/slop/option.rb

@@ -117,6 +117,7 @@ class Slop
     def argument_value
       return @argument_value if @forced
       value = @argument_value || @options[:default]
+      return if value.nil?
 
       case @options[:as].to_s.downcase
       when 'array'

data/lib/slop/version.rb

@@ -1,3 +1,3 @@
 class Slop
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/test/option_test.rb

@@ -104,4 +104,12 @@ class OptionTest < TestCase
     assert_raises(Slop::InvalidArgumentError, /world/) { slop.parse %w/--foo world/ }
     assert slop.parse %w/--foo hello/
   end
+
+  test 'non-casting of nil options' do
+    slop = Slop.new { on :f, :foo, true, :as => String }
+    slop.parse []
+
+    assert_equal nil, slop[:foo]
+    refute_equal "", slop[:foo]
+  end
 end

data/test/slop_test.rb

@@ -260,4 +260,10 @@ class SlopTest < TestCase
     assert_equal 'lee', slop[:name]
     assert slop.name?
   end
+
+  test 'parsing options with options as arguments' do
+    slop = Slop.new { on :f, :foo, true }
+
+    assert_raises(Slop::MissingArgumentError) { slop.parse %w/-f --bar/ }
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: slop
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Lee Jarvis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 +01:00
+date: 2011-03-30 00:00:00 +01:00
 default_executable: 
 dependencies: []