slop 3.0.2 → 3.0.3

data/CHANGES.md

@@ -1,3 +1,9 @@
+3.0.3 (2012-01-30)
+------------------
+
+* Ensure options passed after option terminator do not raise an exception
+  (#54, Amon Sha)
+
 3.0.2 (2012-01-27)
 ------------------
 

data/lib/slop.rb

@@ -4,7 +4,7 @@ require 'slop/commands'
 class Slop
   include Enumerable
 
-  VERSION = '3.0.2'
+  VERSION = '3.0.3'
 
   # The main Error class, all Exception classes inherit from this class.
   class Error < StandardError; end
@@ -367,7 +367,8 @@ class Slop
       @trash << index && break if item == '--'
       autocreate(items, index) if config[:autocreate]
       process_item(items, index, &block) unless @trash.include?(index)
-    }.reject!.with_index { |item, index| delete && @trash.include?(index) }
+    }
+    items.reject!.with_index { |item, index| delete && @trash.include?(index) }
 
     required_options = options.select { |opt| opt.required? && opt.count < 1 }
     if required_options.any?
@@ -571,4 +572,4 @@ class Slop
     object.to_s.sub(/\A--?/, '')
   end
 
-end
+end

data/slop.gemspec

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

@@ -177,6 +177,13 @@ class SlopTest < TestCase
     refute opts.fetch_option(:baz).expects_argument?
   end
 
+  test "option terminator" do
+    opts = Slop.new { on :foo= }
+    items = %w' foo -- --foo bar '
+    opts.parse! items
+    assert_equal %w' foo --foo bar ', items
+  end
+
   test "raising an InvalidArgumentError when the argument doesn't match" do
     opts = Slop.new { on :foo=, :match => /^[a-z]+$/ }
     assert_raises(Slop::InvalidArgumentError) { opts.parse %w' --foo b4r '}
@@ -290,4 +297,4 @@ class SlopTest < TestCase
     end
   end
 
-end
+end

metadata

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