From 03375757627d4269543d887c9ce9bf9b1b59d45c Mon Sep 17 00:00:00 2001 From: Piotr Murach Date: Sat, 18 Apr 2020 12:50:45 +0100 Subject: [PATCH] Change to use minimum param --- lib/tty/option/parser/environments.rb | 3 +-- lib/tty/option/parser/keywords.rb | 3 +-- lib/tty/option/parser/options.rb | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/tty/option/parser/environments.rb b/lib/tty/option/parser/environments.rb index 585101a..9d8ea56 100644 --- a/lib/tty/option/parser/environments.rb +++ b/lib/tty/option/parser/environments.rb @@ -177,9 +177,8 @@ def assign_envvar(env_arg, val) def check_arity @multiplies.each do |name, param| arity = @arities[name] - min_arity = param.arity < 0 ? param.arity.abs - 1 : param.arity - if arity < min_arity + if arity < param.min_arity @error_aggregator.(InvalidArity.new(param, arity)) end end diff --git a/lib/tty/option/parser/keywords.rb b/lib/tty/option/parser/keywords.rb index ddca405..2d01989 100644 --- a/lib/tty/option/parser/keywords.rb +++ b/lib/tty/option/parser/keywords.rb @@ -163,9 +163,8 @@ def assign_keyword(kwarg, val) def check_arity @multiplies.each do |name, param| arity = @arities[name] - min_arity = param.arity < 0 ? param.arity.abs - 1 : param.arity - if arity < min_arity + if arity < param.min_arity @error_aggregator.(InvalidArity.new(param, arity)) end end diff --git a/lib/tty/option/parser/options.rb b/lib/tty/option/parser/options.rb index 81d76fd..c3afbe6 100644 --- a/lib/tty/option/parser/options.rb +++ b/lib/tty/option/parser/options.rb @@ -270,9 +270,8 @@ def assign_option(opt, val) def check_arity @multiplies.each do |name, param| arity = @arities[name] - min_arity = param.arity < 0 ? param.arity.abs - 1 : param.arity - if arity < min_arity + if arity < param.min_arity @error_aggregator.(InvalidArity.new(param, arity)) end end