slop 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09ca8b84867d657dc875e33dd3d230c4e38f7789
-  data.tar.gz: 89f3079de8089096383c7a7c10e2ca01b3ae0706
+  metadata.gz: 496c3e58ee49a489dc45b3885c49b32367ad0fe5
+  data.tar.gz: 7efe7c13f5992f1533486adf452c904f1f4b1981
 SHA512:
-  metadata.gz: 340ec84f97161a331d066eec37d45347dfb3368569276df62c214aa9fcf4d7cc5f9b4de442bfc85f02efa0f0492cf32739efe2a1fcac132695d02a165c67bd13
-  data.tar.gz: 0c3d8e9a7bd21afd3a6748a4b71901dbf4e08c1e6434c731cbabd117441eb7030721d07743ce893caaba92eb6eb2f37e613019de4258a00af0af05950e96eadd
+  metadata.gz: 4b1905b9eefaee4c30dd96eb94a6e1740700c2b370e37230869d1d8ccd4679ae6ea5924ae3f72e0f9be97d21c020003ce875c7eb5a4c75f958ddd1da07110ea6
+  data.tar.gz: ab9fcf28c51edeece517285cdeb33a82fdf4e1a51e853bf94ae2594ea60d1a405cd665b1161871e5ed43717f5b57f157d30814396d8a53c09d82177f0fa0bc87

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+v4.4.0 (2016-08-15)
+-------------------
+
+Features
+  * Support parsing arguments prefixed with dashes. #192 (Andrew Clemons)
+
+Bug fixes:
+  * Retain sort order inside tail sort. #193 (Caio Chassot)
+
 v4.3.0 (2016-03-19)
 -------------------
 

data/lib/slop.rb

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

data/lib/slop/options.rb

@@ -101,7 +101,7 @@ module Slop
       str = config[:banner] ? "#{banner}\n" : ""
       len = longest_flag_length
 
-      options.select(&:help?).sort_by(&:tail).each_with_index do |opt, i|
+      options.select(&:help?).each_with_index.sort_by{ |o,i| [o.tail, i] }.each do |opt, i|
         # use the index to fetch an associated separator
         if sep = separators[i]
           str << "#{sep}\n"

data/lib/slop/parser.rb

@@ -43,7 +43,8 @@ module Slop
 
       @arguments = strings.dup
 
-      pairs.each do |flag, arg|
+      pairs.each_with_index do |pair, idx|
+        flag, arg = pair
         break if !flag
 
         # ignore everything after '--', flag or not
@@ -54,6 +55,7 @@ module Slop
 
         # support `foo=bar`
         orig_flag = flag.dup
+        orig_arg = arg
         if flag.include?("=")
           flag, arg = flag.split("=")
         end
@@ -63,6 +65,12 @@ module Slop
           # arguments (plus the arg if necessary)
           # delete argument first while we can find its index.
           if opt.expects_argument?
+
+            # if we consumed the argument, remove the next pair
+            if orig_arg == opt.value.to_s
+              pairs.delete_at(idx + 1)
+            end
+
             arguments.each_with_index do |argument, i|
               if argument == orig_flag && !orig_flag.include?("=")
                 arguments.delete_at(i + 1)

data/lib/slop/types.rb

@@ -44,7 +44,7 @@ module Slop
   # Cast the option argument to an Integer.
   class IntegerOption < Option
     def call(value)
-      value =~ /\A\d+\z/ && value.to_i
+      value =~ /\A-?\d+\z/ && value.to_i
     end
   end
   IntOption = IntegerOption
@@ -53,7 +53,7 @@ module Slop
   class FloatOption < Option
     def call(value)
       # TODO: scientific notation, etc.
-      value =~ /\A\d*\.*\d+\z/ && value.to_f
+      value =~ /\A-?\d*\.*\d+\z/ && value.to_f
     end
   end
 

data/test/parser_test.rb

@@ -22,6 +22,27 @@ describe Slop::Parser do
     assert_equal 123, @result[:port]
   end
 
+  it "parses arg with leading -" do
+    @options.string "-t", "--text"
+    @result.parser.parse %w(--name=bob --text --sometext)
+    assert_equal "bob", @result[:name]
+    assert_equal "--sometext", @result[:text]
+  end
+
+  it "parses negative integer" do
+    @options.integer "-p", "--port"
+    @result.parser.parse %w(--name=bob --port -123)
+    assert_equal "bob", @result[:name]
+    assert_equal(-123, @result[:port])
+  end
+
+  it "parses negative float" do
+    @options.float "-m", "--multiple"
+    @result.parser.parse %w(--name=bob -m -123.987)
+    assert_equal "bob", @result[:name]
+    assert_equal(-123.987, @result[:multiple])
+  end
+
   describe "parsing grouped short flags" do
     before do
       @options.bool "-q", "--quiet"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Lee Jarvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-19 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake