slop 3.0.3 → 3.0.4

data/CHANGES.md

@@ -1,3 +1,8 @@
+3.0.4 (2012-01-31)
+------------------
+
+* Ensure `option=argument` syntax does not consume following arguments (#55).
+
 3.0.3 (2012-01-30)
 ------------------
 

data/lib/slop.rb

@@ -4,7 +4,7 @@ require 'slop/commands'
 class Slop
   include Enumerable
 
-  VERSION = '3.0.3'
+  VERSION = '3.0.4'
 
   # The main Error class, all Exception classes inherit from this class.
   class Error < StandardError; end
@@ -411,12 +411,12 @@ class Slop
           raise MissingArgumentError, "#{option.key} expects an argument"
         end
 
-        execute_option(option, argument, index)
+        execute_option(option, argument, index, item)
       elsif option.accepts_optional_argument?
         argument ||= items.at(index + 1)
 
         if argument && argument !~ /\A--?/
-          execute_option(option, argument, index)
+          execute_option(option, argument, index, item)
         else
           option.call(nil)
         end
@@ -447,7 +447,7 @@ class Slop
       return
     end
 
-    @trash << index + 1
+    @trash << index + 1 unless item && item.end_with?("=#{argument}")
     option.value = argument
 
     if option.match? && !argument.match(option.config[:match])

data/slop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'slop'
-  s.version = '3.0.3'
+  s.version = '3.0.4'
   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/slop_test.rb

@@ -297,4 +297,11 @@ class SlopTest < TestCase
     end
   end
 
+  test "option=value syntax does NOT consume following argument" do
+    opts = Slop.new { on :foo=; on 'bar=?' }
+    args = %w' --foo=bar baz --bar=zing hello '
+    opts.parse!(args)
+    assert_equal %w' baz hello ', args
+  end
+
 end

metadata

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