slop 3.0.1 → 3.0.2

data/CHANGES.md

@@ -1,5 +1,10 @@
-HEAD
-----
+3.0.2 (2012-01-27)
+------------------
+
+* Ensure `--option=value` is being evaluated before multiple switches (#52)
+
+3.0.1 (2012-01-27)
+------------------
 
 * Ensure tests run green on 1.8.7
 * Ensure `:argument => :optional` works with `:option=` format.

data/lib/slop.rb

@@ -4,7 +4,7 @@ require 'slop/commands'
 class Slop
   include Enumerable
 
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 
   # The main Error class, all Exception classes inherit from this class.
   class Error < StandardError; end
@@ -403,9 +403,7 @@ class Slop
       @trash << index
       @triggered_options << option
 
-      if config[:multiple_switches] && argument
-        execute_multiple_switches(option, argument, index)
-      elsif option.expects_argument?
+      if option.expects_argument?
         argument ||= items.at(index + 1)
 
         if !argument || argument =~ /\A--?[a-zA-Z][a-zA-Z0-9_-]*\z/
@@ -421,6 +419,8 @@ class Slop
         else
           option.call(nil)
         end
+      elsif config[:multiple_switches] && argument
+        execute_multiple_switches(option, argument, index)
       else
         option.call(nil)
       end

data/slop.gemspec

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

@@ -43,6 +43,12 @@ class SlopTest < TestCase
     assert_equal [nil, 'foo', nil, {:optional_argument=>true}], build_option('foo=?')
   end
 
+  test "parsing option=value" do
+    slop = Slop.new { on :foo= }
+    slop.parse %w' --foo=bar '
+    assert_equal 'bar', slop[:foo]
+  end
+
   test "fetch_option" do
     slop = Slop.new
     opt1 = slop.on :f, :foo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
   prerelease: 
 platform: ruby
 authors: