From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvasiliev@tarantool.org>
Received: from smtp54.i.mail.ru (smtp54.i.mail.ru [217.69.128.34])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by dev.tarantool.org (Postfix) with ESMTPS id 5DB3F441840
 for <tarantool-patches@dev.tarantool.org>;
 Wed,  1 Apr 2020 13:00:28 +0300 (MSK)
References: <cover.1584358124.git.lvasiliev@tarantool.org>
 <c5da3dc05b778a45fe7eaca5a75ba72b4ba6c203.1584358124.git.lvasiliev@tarantool.org>
 <20200331232104.GP22874@tarantool.org>
From: lvasiliev <lvasiliev@tarantool.org>
Message-ID: <d21a7985-25cb-27de-1650-86863d022de1@tarantool.org>
Date: Wed, 1 Apr 2020 13:00:27 +0300
MIME-Version: 1.0
In-Reply-To: <20200331232104.GP22874@tarantool.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Subject: Re: [Tarantool-patches] [PATCH v2 1/2] luarocks: Add a kludge for
 option all of luarocks search
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Igor Munkin <imun@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org, v.shpilevoy@tarantool.org

Hi, thanks for the review. You're darn right!

diff --git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in
index 2b95e29..b26dd10 100755
--- a/extra/dist/tarantoolctl.in
+++ b/extra/dist/tarantoolctl.in
@@ -945,7 +945,7 @@ local function rocks()
      end
      table.insert(positional_arguments, key)

-    if positional_arguments[1] == "search" and find_arg("all") then
+    if positional_arguments[1] == "search" and keyword_arguments["all"] 
then
          table.insert(positional_arguments, "--all")
      end

On 01.04.2020 2:21, Igor Munkin wrote:
> Leonid,
> 
> Thanks for the patch! Please consider the comment below.
> 
> On 16.03.20, Leonid Vasiliev wrote:
>> From: Leonid <lvasiliev@tarantool.org>
>>
>> Fixed the tarantoolctl rocks search flag --all
>>
>> Forwarding of the --all flag to tarantoolctl rocks module was added.
>> (Command: tarantoolctl rocks search --all)
>>
>> Fixes: #4529
>> ---
>>   extra/dist/tarantoolctl.in | 6 ++++++
>>   1 file changed, 6 insertions(+)
>>
>> diff --git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in
>> index 6daf866ac..372838edd 100755
>> --- a/extra/dist/tarantoolctl.in
>> +++ b/extra/dist/tarantoolctl.in
> 
> <snipped>
> 
>> @@ -945,6 +946,10 @@ local function rocks()
>>       end
>>       table.insert(positional_arguments, key)
>>   
>> +    if positional_arguments[1] == "search" and find_arg("all") then
> 
> This is a bad check. Consider the following example:
> | $ export LUA_PATH="$LUA_PATH;third_party/luarocks/src/?.lua;;"
> | $ ./extra/dist/tarantoolctl rocks search --all > valid.out
> | $ wc valid.out && echo "Non-empty output"
> | 17835  56986 605906 valid.out
> | Non-empty output
> | $ ./extra/dist/tarantoolctl rocks search all --force > invalid.out
> | $ diff -u valid.out invalid.out && echo "Outputs are the same"
> | Outputs are the same
> 
> You need to check whether 'all' key exists in keyword_arguments, not to
> search 'all' substring in arg tables values.
> 
>> +        table.insert(positional_arguments, "--all")
>> +    end
>> +
>>       -- Tweak help messages
>>       util.see_help = function(command, program)
>>           -- TODO: print extended help message here
> 
> <snipped>
> 
>> -- 
>> 2.17.1
>>
>