slop 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de2091f9afde594e40aac061706815b7136bbf2c
-  data.tar.gz: 9ba238ffb27744cbf3293cb532824f18a10f5e7e
+  metadata.gz: 4d27e2c3615ec37ec13f7a425eca0bd2095019f4
+  data.tar.gz: e9bd705f261dd6c8f91e53e48c4eb0afaa47b809
 SHA512:
-  metadata.gz: a9701396bf3f9e1def3dbf17d38446f96ea560b7a046a3cab55783d053212a019a8f75102550dc67baf0df8b793dae0466ff1332fb0e42d0387cda143bdf20c2
-  data.tar.gz: dbb443da3652723951432d1603bbf2fe614335ea0c7605d5e9bdffb04f06c5f4042bed5fe2880f64d3fec978bd14aef006fdb2946359e6db0368557bae12dda5
+  metadata.gz: fab6f8d628b08341f2d51f980a75654cb229e1a7a3412e0bc3fc3b19d39a0064adb7461a77a70fd491495e22ae766d464ea7850213320f64b41d72674e68080b
+  data.tar.gz: cca338b3042a5614a673f14a88b50fa990143a31c4c57faeaee3427476468074249ccc803ab7e2a67ad8f9cf31fc6877c87c09c14898ee2725393691edb7bd91

data/.travis.yml

@@ -1,18 +1,15 @@
 cache: bundler
 before_install:
-  - gem update bundler
+  - gem install bundler
 rvm:
   - 2.0.0
   - 2.1
   - 2.2
-  - 2.3.0
-  - rbx-2
+  - 2.3.4
+  - 2.4.1
+  - jruby-9.1.8.0
   - jruby-head
   - ruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
 notifications:
   email:
     on_success: change

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+v4.4.2 (2017-06-29)
+-------------------
+
+Bug fixes:
+  * Fix support for parsing -x5 or -nfoo. #199
+  * Fix removing arguments after `--`. #194
+
 v4.4.1 (2016-08-21)
 -------------------
 

data/lib/slop.rb

@@ -6,7 +6,7 @@ require 'slop/types'
 require 'slop/error'
 
 module Slop
-  VERSION = '4.4.1'
+  VERSION = '4.4.2'
 
   # Parse an array of options (defaults to ARGV). Accepts an
   # optional hash of configuration options and block.

data/lib/slop/parser.rb

@@ -36,6 +36,9 @@ module Slop
     def parse(strings)
       reset # reset before every parse
 
+      # ignore everything after "--"
+      strings, ignored_args = partition(strings)
+
       pairs = strings.each_cons(2).to_a
       # this ensures we still support the last string being a flag,
       # otherwise it'll only be used as an argument.
@@ -47,12 +50,6 @@ module Slop
         flag, arg = pair
         break if !flag
 
-        # ignore everything after '--', flag or not
-        if flag == '--'
-          arguments.delete(flag)
-          break
-        end
-
         # support `foo=bar`
         orig_flag = flag.dup
         orig_arg = arg
@@ -81,6 +78,8 @@ module Slop
         end
       end
 
+      @arguments += ignored_args
+
       Result.new(self).tap do |result|
         used_options.each { |o| o.finish(result) }
       end
@@ -111,13 +110,7 @@ module Slop
       elsif flag.start_with?("--no-") && option = matching_option(flag.sub("no-", ""))
         process(option, false)
       elsif flag =~ /\A-[^-]{2,}/
-        # try and process as a set of grouped short flags. drop(1) removes
-        # the prefixed -, then we add them back to each flag separately.
-        flags = flag.split("").drop(1).map { |f| "-#{f}" }
-        last  = flags.pop
-
-        flags.each { |f| try_process(f, nil) }
-        try_process(last, arg) # send the argument to the last flag
+        try_process_smashed_arg(flag) || try_process_grouped_flags(flag, arg)
       else
         if flag.start_with?("-") && !suppress_errors?
           raise UnknownOption.new("unknown option `#{flag}'", "#{flag}")
@@ -125,6 +118,25 @@ module Slop
       end
     end
 
+    # try and process a flag with a "smashed" argument, e.g.
+    # -nFoo or -i5
+    def try_process_smashed_arg(flag)
+      option = matching_option(flag[0, 2])
+      if option && option.expects_argument?
+        process(option, flag[2..-1])
+      end
+    end
+
+    # try and process as a set of grouped short flags. drop(1) removes
+    # the prefixed -, then we add them back to each flag separately.
+    def try_process_grouped_flags(flag, arg)
+      flags = flag.split("").drop(1).map { |f| "-#{f}" }
+      last  = flags.pop
+
+      flags.each { |f| try_process(f, nil) }
+      try_process(last, arg) # send the argument to the last flag
+    end
+
     def suppress_errors?
       config[:suppress_errors]
     end
@@ -132,5 +144,14 @@ module Slop
     def matching_option(flag)
       options.find { |o| o.flags.include?(flag) }
     end
+
+    private def partition(strings)
+      if strings.include?("--")
+        partition_idx = strings.index("--")
+        [strings[0..partition_idx-1], strings[partition_idx+1..-1]]
+      else
+        [strings, []]
+      end
+    end
   end
 end

data/test/parser_test.rb

@@ -11,8 +11,9 @@ describe Slop::Parser do
   end
 
   it "ignores everything after --" do
-    @parser.parse %w(-v -- --name lee)
+    @parser.parse %w(-v -- -v --name lee)
     assert_equal [@verbose], @parser.used_options
+    assert_equal ["-v", "--name", "lee"], @parser.arguments
   end
 
   it "parses flag=argument" do
@@ -66,6 +67,19 @@ describe Slop::Parser do
     end
   end
 
+  describe "short flags with arguments" do
+    before do
+      @options.integer "-i"
+      @options.string "-s"
+    end
+
+    it "parses the argument" do
+      @result.parser.parse %w(-i5 -sfoo)
+      assert_equal 5, @result[:i]
+      assert_equal "foo", @result[:s]
+    end
+  end
+
   describe "#used_options" do
     it "returns all options that were parsed" do
       assert_equal [@verbose, @name], @parser.used_options

data/test/result_test.rb

@@ -97,7 +97,7 @@ describe Slop::Result do
     end
 
     it "returns nil if nothing is found" do
-      assert_equal nil, @result.option("foo")
+      assert_nil @result.option("foo")
     end
   end
 

data/test/types_test.rb

@@ -41,7 +41,7 @@ describe Slop::IntegerOption do
 
   it "returns nil for non-numbers by default" do
     @result.parser.parse %w(--age hello)
-    assert_equal nil, @result[:age]
+    assert_nil @result[:age]
   end
 end
 
@@ -59,7 +59,7 @@ describe Slop::FloatOption do
 
   it "returns nil for non-numbers by default" do
     @result.parser.parse %w(--apr hello)
-    assert_equal nil, @result[:apr]
+    assert_nil @result[:apr]
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors:
 - Lee Jarvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-21 00:00:00.000000000 Z
+date: 2017-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -100,4 +100,3 @@ test_files:
 - test/slop_test.rb
 - test/test_helper.rb
 - test/types_test.rb
-has_rdoc: