[Tarantool-patches] [PATCH 0/2] Fix some options for rocks

[Tarantool-patches] [PATCH 0/2] Fix some options for rocks

[Leonid]

https://github.com/tarantool/tarantool/issues/3632
https://github.com/tarantool/tarantool/issues/4529
https://github.com/tarantool/tarantool/tree/lvasiliev/gh-4529-fix-show-all

Leonid (2):
  luarocks: add a kludge for option all of luarocks search
  luarocks: add a kludge for option force of luarocks remove

 extra/dist/tarantoolctl.in | 11 +++++++++++
 1 file changed, 11 insertions(+)

-- 
2.17.1

[Tarantool-patches] [PATCH 1/2] luarocks: add a kludge for option all of luarocks search

[Leonid]

---
 extra/dist/tarantoolctl.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in
index 6daf866ac..09302ea9c 100755
--- a/extra/dist/tarantoolctl.in
+++ b/extra/dist/tarantoolctl.in
@@ -937,6 +937,7 @@ local function rocks()
     local util = require("luarocks.util")
     local command_line = require("luarocks.cmd")
     local options = keyword_arguments
+
     local key = nil
     if options["only-server"] ~= nil then
         key = find_arg("only%-server")
@@ -945,6 +946,10 @@ local function rocks()
     end
     table.insert(positional_arguments, key)
 
+    if positional_arguments[1] == "search" and  find_arg("all") then
+        table.insert(positional_arguments, "--all")
+    end
+
     -- Tweak help messages
     util.see_help = function(command, program)
         -- TODO: print extended help message here
@@ -1400,6 +1405,7 @@ local function populate_arguments()
         { 'only-server', 'string'  },
         { 'server',      'string'  },
         { 'language',    'string'  },
+        { 'all',         'boolean' },
     })
 
     local cmd_name
-- 
2.17.1

Re: [Tarantool-patches] [PATCH 1/2] luarocks: add a kludge for option all of luarocks search

[Vladislav Shpilevoy]

Thanks for the patch!

Please, provide a more detailed message of what and why was
done, exactly. And how to test it. And a docbot request, if
you change any publicly visible behaviour of a documented
module.

All the same for the second patch. If you will add a docbot
request, it is enough to make one for two commits.

Also, please, rebase the branch on the latest master.

See 2 comments below.

On 15/11/2019 16:44, Leonid wrote:
> ---
>  extra/dist/tarantoolctl.in | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in
> index 6daf866ac..09302ea9c 100755
> --- a/extra/dist/tarantoolctl.in
> +++ b/extra/dist/tarantoolctl.in
> @@ -937,6 +937,7 @@ local function rocks()
>      local util = require("luarocks.util")
>      local command_line = require("luarocks.cmd")
>      local options = keyword_arguments
> +

1. Please, don't do stray changes not related to the issues.

>      local key = nil
>      if options["only-server"] ~= nil then
>          key = find_arg("only%-server")
> @@ -945,6 +946,10 @@ local function rocks()
>      end
>      table.insert(positional_arguments, key)
>  
> +    if positional_arguments[1] == "search" and  find_arg("all") then

2. Double whitespace after 'and'. The same in the next patch.

> +        table.insert(positional_arguments, "--all")
> +    end
> +
>      -- Tweak help messages
>      util.see_help = function(command, program)
>          -- TODO: print extended help message here
> @@ -1400,6 +1405,7 @@ local function populate_arguments()
>          { 'only-server', 'string'  },
>          { 'server',      'string'  },
>          { 'language',    'string'  },
> +        { 'all',         'boolean' },
>      })
>  
>      local cmd_name
> 

Re: [Tarantool-patches] [PATCH 1/2] luarocks: add a kludge for option all of luarocks search

[Leonid Vasiliev]

Hi. Thanks for the review!

On 3/15/20 8:54 PM, Vladislav Shpilevoy wrote:
> Thanks for the patch!
> 
> Please, provide a more detailed message of what and why was
> done, exactly. And how to test it. And a docbot request, if
> you change any publicly visible behaviour of a documented
> module.

Behavior has't been changed, just fixed.

> 
> All the same for the second patch. If you will add a docbot
> request, it is enough to make one for two commits.
> 
> Also, please, rebase the branch on the latest master.
> 

Done. See V2

> See 2 comments below.
> 
> On 15/11/2019 16:44, Leonid wrote:
>> ---
>>   extra/dist/tarantoolctl.in | 6 ++++++
>>   1 file changed, 6 insertions(+)
>>
>> diff --git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in
>> index 6daf866ac..09302ea9c 100755
>> --- a/extra/dist/tarantoolctl.in
>> +++ b/extra/dist/tarantoolctl.in
>> @@ -937,6 +937,7 @@ local function rocks()
>>       local util = require("luarocks.util")
>>       local command_line = require("luarocks.cmd")
>>       local options = keyword_arguments
>> +
> 
> 1. Please, don't do stray changes not related to the issues.
> 
>>       local key = nil
>>       if options["only-server"] ~= nil then
>>           key = find_arg("only%-server")
>> @@ -945,6 +946,10 @@ local function rocks()
>>       end
>>       table.insert(positional_arguments, key)
>>   
>> +    if positional_arguments[1] == "search" and  find_arg("all") then
> 
> 2. Double whitespace after 'and'. The same in the next patch.
> 
>> +        table.insert(positional_arguments, "--all")
>> +    end
>> +
>>       -- Tweak help messages
>>       util.see_help = function(command, program)
>>           -- TODO: print extended help message here
>> @@ -1400,6 +1405,7 @@ local function populate_arguments()
>>           { 'only-server', 'string'  },
>>           { 'server',      'string'  },
>>           { 'language',    'string'  },
>> +        { 'all',         'boolean' },
>>       })
>>   
>>       local cmd_name
>>

[Tarantool-patches] [PATCH 2/2] luarocks: add a kludge for option force of luarocks remove

[Leonid]

---
 extra/dist/tarantoolctl.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in
index 09302ea9c..25c3fb1a2 100755
--- a/extra/dist/tarantoolctl.in
+++ b/extra/dist/tarantoolctl.in
@@ -950,6 +950,10 @@ local function rocks()
         table.insert(positional_arguments, "--all")
     end
 
+    if positional_arguments[1] == "remove" and  find_arg("force") then
+        table.insert(positional_arguments, "--force")
+    end
+
     -- Tweak help messages
     util.see_help = function(command, program)
         -- TODO: print extended help message here
@@ -1406,6 +1410,7 @@ local function populate_arguments()
         { 'server',      'string'  },
         { 'language',    'string'  },
         { 'all',         'boolean' },
+        { 'force',       'boolean' },
     })
 
     local cmd_name
-- 
2.17.1

Re: [Tarantool-patches] [PATCH 0/2] Fix some options for rocks

[Vladislav Shpilevoy]

Hi! Thanks for the patch!

Please, provide a changelog record, and a patchset description.

On 15/11/2019 16:44, Leonid wrote:
> https://github.com/tarantool/tarantool/issues/3632
> https://github.com/tarantool/tarantool/issues/4529
> https://github.com/tarantool/tarantool/tree/lvasiliev/gh-4529-fix-show-all
> 
> Leonid (2):
>   luarocks: add a kludge for option all of luarocks search
>   luarocks: add a kludge for option force of luarocks remove
> 
>  extra/dist/tarantoolctl.in | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>