slop 3.3.0 → 3.3.1

data/CHANGES.md

@@ -1,3 +1,8 @@
+3.3.1 (2012-05-31)
+------------------
+
+* Stop multiple switches from trashing arguments (Conrad Irwin, #66)
+
 3.3.0 (2012-05-30)
 ------------------
 

data/lib/slop.rb

@@ -4,7 +4,7 @@ require 'slop/commands'
 class Slop
   include Enumerable
 
-  VERSION = '3.3.0'
+  VERSION = '3.3.1'
 
   # The main Error class, all Exception classes inherit from this class.
   class Error < StandardError; end
@@ -466,8 +466,12 @@ class Slop
       return
     end
 
-    @trash << index + 1 unless item && item.end_with?("=#{argument}")
-    option.value = argument
+    if argument
+      @trash << index + 1 unless item && item.end_with?("=#{argument}")
+      option.value = argument
+    else
+      option.value = option.count > 0
+    end
 
     if option.match? && !argument.match(option.config[:match])
       raise InvalidArgumentError, "#{argument} is an invalid argument"
@@ -485,11 +489,11 @@ class Slop
   #
   # Returns nothing.
   def execute_multiple_switches(option, argument, index)
-    execute_option(option, argument, index)
+    execute_option(option, nil, index)
     argument.split('').each do |key|
       opt = fetch_option(key)
       opt.count += 1
-      execute_option(opt, argument, index, key)
+      execute_option(opt, nil, index, key)
     end
   end
 

data/slop.gemspec

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

@@ -218,6 +218,12 @@ class SlopTest < TestCase
     assert_equal 'abc123', opts[:f]
   end
 
+  test "muiltiple_switches should not trash arguments" do
+    opts = Slop.new{ on :f; on :b }
+    args = opts.parse!(%w'-fb foo')
+    assert_equal %w'foo', args
+  end
+
   test "setting/getting the banner" do
     opts = Slop.new :banner => 'foo'
     assert_equal 'foo', opts.banner

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70279515453400 !ruby/object:Gem::Requirement
+  requirement: &70351938520120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70279515453400
+  version_requirements: *70351938520120
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70279515450800 !ruby/object:Gem::Requirement
+  requirement: &70351938541500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70279515450800
+  version_requirements: *70351938541500
 description: A simple DSL for gathering options and parsing the command line
 email: lee@jarvis.co
 executables: []
@@ -68,7 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -452403334270182101
+      hash: 4605818326398820360
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -452403334270182101
+      hash: 4605818326398820360
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11