slop 3.4.5 → 3.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68937e18cd6530ee2f31c7ef36a4cd7cb8259f05
-  data.tar.gz: bcfe723b43f378c5205b44c2b10aa063692d4241
+  metadata.gz: ee8bab0b8e39c57a64b27be99083022699b0b133
+  data.tar.gz: 908937f49a1e197b07710292385731891ca3eee1
 SHA512:
-  metadata.gz: fd370624b2039b5367c994d0c3f5cbcfad850a8f9da3972d579c7c04f53e67204d7ade792e287099a8fdd83b784e13ca4f69250a9f20d587fc876e13dcb95c5c
-  data.tar.gz: 5329b9d7c8c5afe7806e99fdc90bd0dd0e5da49c0b2c278df1cb9519c2cf478662911a1b5abfbee502d2dfa0927dddd3504a0fc517633ca763084b49b12fee69
+  metadata.gz: a0b5d7a91bd89cf4fe1a272a3aa804e1330c1cf2fd1b6152f25cb7655ee8de759de9763780d7c93c265f9369deea969aec750ad1b123afd3143065b64888d3d7
+  data.tar.gz: fab9002de7d781eb65b746fe03c01d9b7ba7075082d17afe3c3f57ccecf33425129e80f9ec4c90d1e40add93dc2e75a16e8fb0fa6d84ad19480dbd6a10a38daf

data/CHANGES.md

@@ -1,7 +1,9 @@
-HEAD
-----
+3.4.5 (2013-05-14)
+------------------
 
 * Allow specifying long options starting with numbers (#110, Peter Zotov)
+* Ensure short-options still consume trailing arguments, ie `-abc foo`
+  should assign `foo` to the option `c` if it expects an argument (#114).
 
 3.4.4 (2013-03-12)
 ------------------

data/README.md

@@ -4,7 +4,7 @@ Slop
 Slop is a simple option parser with an easy to remember syntax and friendly API.
 API Documentation is available [here](http://injekt.github.com/rdoc/slop/).
 
-[![Build Status](https://secure.travis-ci.org/injekt/slop.png)](http://travis-ci.org/injekt/slop)
+[![Build Status](https://travis-ci.org/injekt/slop.png?branch=master)](http://travis-ci.org/injekt/slop)
 
 Usage
 -----
@@ -44,7 +44,7 @@ All of these options can be sent to `Slop.new` or `Slop.parse` in Hash form.
 * `strict` - Enable strict mode. When processing unknown options, Slop will
   raise an `InvalidOptionError`. **default:** *false*.
 * `help` - Automatically add the `--help` option. **default:** *false*.
-* `banner` - Set this options banner text. **default:** *nil*.
+* `banner` - Set the help banner text. **default:** *nil*.
 * `ignore_case` - When enabled, `-A` will look for the `-a` option if `-A`
   does not exist. **default:** *false*.
 * `autocreate` - Autocreate options on the fly. **default:** *false*.
@@ -101,7 +101,7 @@ Autocreate
 
 Slop has an 'autocreate' feature. This feature is intended to create
 options on the fly, without having to specify them yourself. In some case,
-uses this code could be all you need in your application:
+using this code could be all you need in your application:
 
 ```ruby
 # ruby run.rb --foo bar --baz --name lee

data/lib/slop.rb

@@ -4,7 +4,7 @@ require 'slop/commands'
 class Slop
   include Enumerable
 
-  VERSION = '3.4.5'
+  VERSION = '3.4.6'
 
   # The main Error class, all Exception classes inherit from this class.
   class Error < StandardError; end
@@ -567,13 +567,16 @@ class Slop
     execute_option(option, nil, index)
     flags = argument.split('')
     flags.each do |key|
-      next unless opt = fetch_option(key)
-      opt.count += 1
-      if (opt.expects_argument? || opt.accepts_optional_argument?) &&
-          (flags[-1] == opt.key) && (val = items[index+1])
-        execute_option(opt, val, index, key)
+      if opt = fetch_option(key)
+        opt.count += 1
+        if (opt.expects_argument? || opt.accepts_optional_argument?) &&
+            (flags[-1] == opt.key) && (val = items[index+1])
+          execute_option(opt, val, index, key)
+        else
+          execute_option(opt, nil, index, key)
+        end
       else
-        execute_option(opt, nil, index, key)
+        raise InvalidOptionError, "Unknown option -#{key}" if strict?
       end
     end
   end
@@ -627,31 +630,22 @@ class Slop
     config[:optional_argument] = true if @config[:optional_arguments]
 
     if objects.last.is_a?(Hash)
-      config.merge!(objects.last)
-      objects.pop
+      config.merge!(objects.pop)
     end
+
     short = extract_short_flag(objects, config)
     long  = extract_long_flag(objects, config)
-    desc  = objects[0].respond_to?(:to_str) ? objects.shift : nil
+    desc  = objects.shift if objects[0].respond_to?(:to_str)
 
     Option.new(self, short, long, desc, config, &block)
   end
 
-  # Extract the short flag from an item.
-  #
-  # objects - The Array of objects passed from #build_option.
-  # config  - The Hash of configuration options built in #build_option.
   def extract_short_flag(objects, config)
-    flag = clean(objects.first)
-
-    if flag.size == 2 && flag.end_with?('=')
-      config[:argument] ||= true
-      flag.chop!
-    end
-
-    if flag.size == 1
+    flag = objects[0].to_s
+    if flag =~ /\A-?\w=?\z/
+      config[:argument] ||= flag.end_with?('=')
       objects.shift
-      flag
+      flag.delete('-=')
     end
   end
 

data/slop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'slop'
-  s.version     = '3.4.5'
+  s.version     = '3.4.6'
   s.summary     = 'Simple Lightweight Option Parsing'
   s.description = 'A simple DSL for gathering options and parsing the command line'
   s.author      = 'Lee Jarvis'

data/test/slop_test.rb

@@ -228,6 +228,17 @@ class SlopTest < TestCase
     assert_raises(Slop::InvalidOptionError) { opts.parse %w'-fabc' }
   end
 
+  test "raising InvalidOptionError for multiple short options" do
+    opts = Slop.new :strict => true
+    opts.on :L
+    assert_raises(Slop::InvalidOptionError) { opts.parse %w'-Ly' }
+
+    # but not with no strict mode!
+    opts = Slop.new
+    opts.on :L
+    assert opts.parse %w'-Ly'
+  end
+
   test "multiple_switches is enabled by default" do
     opts = Slop.new { on :f; on :b }
     opts.parse %w[ -fb ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 3.4.5
+  version: 3.4.6
 platform: ruby
 authors:
 - Lee Jarvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Simple Lightweight Option Parsing