Change to only collect options matching arity

piotrmurach · Apr 6, 2020 · 2085269 · 2085269
1 parent 87b3c43
commit 2085269
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 6 deletions.
diff --git a/lib/tty/option/parser/options.rb b/lib/tty/option/parser/options.rb
@@ -27,6 +27,7 @@ def initialize(options, **config)
           @remaining = []
           @shorts = {}
           @longs = {}
+          @arities = {}
           @required = []
 
           setup_opts
@@ -67,6 +68,7 @@ def parse(argv)
             opt, value = next_option
             break if opt.nil?
             @required.delete(opt)
+            @arities[opt.name] = @arities[opt.name].to_i + 1
 
             if block_given?
               yield(opt, value)
@@ -278,13 +280,19 @@ def assign_option(opt, val)
           value = Pipeline.process(opt, val)
 
           if opt.multiple?
-            case value
-            when Hash
-              (@parsed[opt.name] ||= {}).merge!(value)
-            else
-              Array(value).each do |v|
-                (@parsed[opt.name] ||= []) << v
+            allowed = opt.arity < 0 || (@arities[opt.name] || 0) <= opt.arity
+            if allowed
+              case value
+              when Hash
+                (@parsed[opt.name] ||= {}).merge!(value)
+              else
+                Array(value).each do |v|
+                  (@parsed[opt.name] ||= []) << v
+                end
               end
+            else
+              @remaining << opt.short_name
+              @remaining << value
             end
           else
             @parsed[opt.name] = value

diff --git a/spec/unit/parser/options_spec.rb b/spec/unit/parser/options_spec.rb
@@ -348,12 +348,33 @@ def parse(argv, options, **config)
       expect(rest).to eq([])
     end
 
+    it "parses short flag with required argument many times and keeps only two" do
+      params, rest = parse(%w[-f 1 -f 2 -f 3], option(:foo, short: "-f int", arity: 2))
+
+      expect(params[:foo]).to eq(%w[1 2])
+      expect(rest).to eq(%w[-f 3])
+    end
+
+    it "parses short flag with required argument many times and keeps all" do
+      params, rest = parse(%w[-f 1 -f 2 -f 3], option(:foo, short: "-f int", arity: :any))
+
+      expect(params[:foo]).to eq(%w[1 2 3])
+      expect(rest).to eq([])
+    end
+
     it "parses long flag with required argument and keeps the last argument" do
       params, rest = parse(%w[--f 1 --f 2 --f 3], option(:foo, long: "--f int"))
 
       expect(params[:foo]).to eq("3")
       expect(rest).to eq([])
     end
+
+    it "parses long flags with required argument and keeps all" do
+      params, rest = parse(%w[--f 1 --f 2 --f 3], option(:foo, long: "--f int", arity: -2))
+
+      expect(params[:foo]).to eq(%w[1 2 3])
+      expect(rest).to eq([])
+    end
   end
 
   context "when list argument" do