From fca4a63277c0fc8d39eb887744b294ff5fd05ad6 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Mon, 13 Jun 2016 12:47:34 +0300
Subject: Remove 'run' interface for commands

---
 src/luarocks/add.lua            | 1 -
 src/luarocks/admin_remove.lua   | 1 -
 src/luarocks/build.lua          | 1 -
 src/luarocks/config_cmd.lua     | 1 -
 src/luarocks/doc.lua            | 1 -
 src/luarocks/download.lua       | 1 -
 src/luarocks/help.lua           | 1 -
 src/luarocks/install.lua        | 1 -
 src/luarocks/lint.lua           | 1 -
 src/luarocks/list.lua           | 1 -
 src/luarocks/make.lua           | 1 -
 src/luarocks/make_manifest.lua  | 1 -
 src/luarocks/new_version.lua    | 1 -
 src/luarocks/pack.lua           | 1 -
 src/luarocks/path_cmd.lua       | 1 -
 src/luarocks/purge.lua          | 1 -
 src/luarocks/refresh_cache.lua  | 2 --
 src/luarocks/remove.lua         | 1 -
 src/luarocks/search.lua         | 1 -
 src/luarocks/show.lua           | 1 -
 src/luarocks/unpack.lua         | 1 -
 src/luarocks/upload.lua         | 1 -
 src/luarocks/util.lua           | 7 -------
 src/luarocks/validate.lua       | 1 -
 src/luarocks/write_rockspec.lua | 1 -
 25 files changed, 32 deletions(-)

(limited to 'src')

diff --git a/src/luarocks/add.lua b/src/luarocks/add.lua
index f37d334d..66f7504f 100644
--- a/src/luarocks/add.lua
+++ b/src/luarocks/add.lua
@@ -12,7 +12,6 @@ local index = require("luarocks.index")
 local fs = require("luarocks.fs")
 local cache = require("luarocks.cache")
 
-util.add_run_function(add)
 add.help_summary = "Add a rock or rockspec to a rocks server."
 add.help_arguments = "[--server=<server>] [--no-refresh] {<rockspec>|<rock>...}"
 add.help = [[
diff --git a/src/luarocks/admin_remove.lua b/src/luarocks/admin_remove.lua
index 621f1317..be1e7cbc 100644
--- a/src/luarocks/admin_remove.lua
+++ b/src/luarocks/admin_remove.lua
@@ -12,7 +12,6 @@ local index = require("luarocks.index")
 local fs = require("luarocks.fs")
 local cache = require("luarocks.cache")
 
-util.add_run_function(admin_remove)
 admin_remove.help_summary = "Remove a rock or rockspec from a rocks server."
 admin_remove.help_arguments = "[--server=<server>] [--no-refresh] {<rockspec>|<rock>...}"
 admin_remove.help = [[
diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index a0170f06..4a71b4c5 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -16,7 +16,6 @@ local manif = require("luarocks.manif")
 local remove = require("luarocks.remove")
 local cfg = require("luarocks.cfg")
 
-util.add_run_function(build)
 build.help_summary = "Build/compile a rock."
 build.help_arguments = "[--pack-binary-rock] [--keep] {<rockspec>|<rock>|<name> [<version>]}"
 build.help = [[
diff --git a/src/luarocks/config_cmd.lua b/src/luarocks/config_cmd.lua
index fe3cc637..9e73d228 100644
--- a/src/luarocks/config_cmd.lua
+++ b/src/luarocks/config_cmd.lua
@@ -6,7 +6,6 @@ local cfg = require("luarocks.cfg")
 local util = require("luarocks.util")
 local dir = require("luarocks.dir")
 
-util.add_run_function(config_cmd)
 config_cmd.help_summary = "Query information about the LuaRocks configuration."
 config_cmd.help_arguments = "<flag>"
 config_cmd.help = [[
diff --git a/src/luarocks/doc.lua b/src/luarocks/doc.lua
index ec2b1110..758fd9c5 100644
--- a/src/luarocks/doc.lua
+++ b/src/luarocks/doc.lua
@@ -12,7 +12,6 @@ local fetch = require("luarocks.fetch")
 local fs = require("luarocks.fs")
 local download = require("luarocks.download")
 
-util.add_run_function(doc)
 doc.help_summary = "Show documentation for an installed rock."
 
 doc.help = [[
diff --git a/src/luarocks/download.lua b/src/luarocks/download.lua
index 18573ae4..d793cab7 100644
--- a/src/luarocks/download.lua
+++ b/src/luarocks/download.lua
@@ -12,7 +12,6 @@ local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local cfg = require("luarocks.cfg")
 
-util.add_run_function(download)
 download.help_summary = "Download a specific rock file from a rocks server."
 download.help_arguments = "[--all] [--arch=<arch> | --source | --rockspec] [<name> [<version>]]"
 
diff --git a/src/luarocks/help.lua b/src/luarocks/help.lua
index 28f97702..5bac77ce 100644
--- a/src/luarocks/help.lua
+++ b/src/luarocks/help.lua
@@ -12,7 +12,6 @@ local dir = require("luarocks.dir")
 
 local program = util.this_program("luarocks")
 
-util.add_run_function(help)
 help.help_summary = "Help on commands. Type '"..program.." help <command>' for more."
 
 help.help_arguments = "[<command>]"
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index acbf584a..10d57f37 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -13,7 +13,6 @@ local manif = require("luarocks.manif")
 local remove = require("luarocks.remove")
 local cfg = require("luarocks.cfg")
 
-util.add_run_function(install)
 install.help_summary = "Install a rock."
 
 install.help_arguments = "{<rock>|<name> [<version>]}"
diff --git a/src/luarocks/lint.lua b/src/luarocks/lint.lua
index d5cc48d0..4c30804b 100644
--- a/src/luarocks/lint.lua
+++ b/src/luarocks/lint.lua
@@ -8,7 +8,6 @@ local util = require("luarocks.util")
 local download = require("luarocks.download")
 local fetch = require("luarocks.fetch")
 
-util.add_run_function(lint)
 lint.help_summary = "Check syntax of a rockspec."
 lint.help_arguments = "<rockspec>"
 lint.help = [[
diff --git a/src/luarocks/list.lua b/src/luarocks/list.lua
index c65e058f..8c9c5107 100644
--- a/src/luarocks/list.lua
+++ b/src/luarocks/list.lua
@@ -10,7 +10,6 @@ local cfg = require("luarocks.cfg")
 local util = require("luarocks.util")
 local path = require("luarocks.path")
 
-util.add_run_function(list)
 list.help_summary = "List currently installed rocks."
 list.help_arguments = "[--porcelain] <filter>"
 list.help = [[
diff --git a/src/luarocks/make.lua b/src/luarocks/make.lua
index 1464def7..476150eb 100644
--- a/src/luarocks/make.lua
+++ b/src/luarocks/make.lua
@@ -15,7 +15,6 @@ local pack = require("luarocks.pack")
 local remove = require("luarocks.remove")
 local deps = require("luarocks.deps")
 
-util.add_run_function(make)
 make.help_summary = "Compile package in current directory using a rockspec."
 make.help_arguments = "[--pack-binary-rock] [<rockspec>]"
 make.help = [[
diff --git a/src/luarocks/make_manifest.lua b/src/luarocks/make_manifest.lua
index c39c2939..b89ba47f 100644
--- a/src/luarocks/make_manifest.lua
+++ b/src/luarocks/make_manifest.lua
@@ -12,7 +12,6 @@ local deps = require("luarocks.deps")
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 
-util.add_run_function(make_manifest)
 make_manifest.help_summary = "Compile a manifest file for a repository."
 
 make_manifest.help = [[
diff --git a/src/luarocks/new_version.lua b/src/luarocks/new_version.lua
index bd73e308..eb5dea25 100644
--- a/src/luarocks/new_version.lua
+++ b/src/luarocks/new_version.lua
@@ -10,7 +10,6 @@ local persist = require("luarocks.persist")
 local fs = require("luarocks.fs")
 local type_check = require("luarocks.type_check")
 
-util.add_run_function(new_version)
 new_version.help_summary = "Auto-write a rockspec for a new version of a rock."
 new_version.help_arguments = "[--tag=<tag>] [<package>|<rockspec>] [<new_version>] [<new_url>]"
 new_version.help = [[
diff --git a/src/luarocks/pack.lua b/src/luarocks/pack.lua
index 277cf246..3a163e92 100644
--- a/src/luarocks/pack.lua
+++ b/src/luarocks/pack.lua
@@ -16,7 +16,6 @@ local dir = require("luarocks.dir")
 local manif = require("luarocks.manif")
 local search = require("luarocks.search")
 
-util.add_run_function(pack)
 pack.help_summary = "Create a rock, packing sources or binaries."
 pack.help_arguments = "{<rockspec>|<name> [<version>]}"
 pack.help = [[
diff --git a/src/luarocks/path_cmd.lua b/src/luarocks/path_cmd.lua
index 15fb9ca2..c0329977 100644
--- a/src/luarocks/path_cmd.lua
+++ b/src/luarocks/path_cmd.lua
@@ -7,7 +7,6 @@ local util = require("luarocks.util")
 local deps = require("luarocks.deps")
 local cfg = require("luarocks.cfg")
 
-util.add_run_function(path_cmd)
 path_cmd.help_summary = "Return the currently configured package path."
 path_cmd.help_arguments = ""
 path_cmd.help = [[
diff --git a/src/luarocks/purge.lua b/src/luarocks/purge.lua
index 1ce46c0f..18043cc3 100644
--- a/src/luarocks/purge.lua
+++ b/src/luarocks/purge.lua
@@ -14,7 +14,6 @@ local manif = require("luarocks.manif")
 local cfg = require("luarocks.cfg")
 local remove = require("luarocks.remove")
 
-util.add_run_function(purge)
 purge.help_summary = "Remove all installed rocks from a tree."
 purge.help_arguments = "--tree=<tree> [--old-versions]"
 purge.help = [[
diff --git a/src/luarocks/refresh_cache.lua b/src/luarocks/refresh_cache.lua
index bbfd1f4d..1261044f 100644
--- a/src/luarocks/refresh_cache.lua
+++ b/src/luarocks/refresh_cache.lua
@@ -3,11 +3,9 @@
 local refresh_cache = {}
 package.loaded["luarocks.refresh_cache"] = refresh_cache
 
-local util = require("luarocks.util")
 local cfg = require("luarocks.cfg")
 local cache = require("luarocks.cache")
 
-util.add_run_function(refresh_cache)
 refresh_cache.help_summary = "Refresh local cache of a remote rocks server."
 refresh_cache.help_arguments = "[--from=<server>]"
 refresh_cache.help = [[
diff --git a/src/luarocks/remove.lua b/src/luarocks/remove.lua
index d72fabaf..3f62e89e 100644
--- a/src/luarocks/remove.lua
+++ b/src/luarocks/remove.lua
@@ -14,7 +14,6 @@ local cfg = require("luarocks.cfg")
 local manif = require("luarocks.manif")
 local fs = require("luarocks.fs")
 
-util.add_run_function(remove)
 remove.help_summary = "Uninstall a rock."
 remove.help_arguments = "[--force|--force-fast] <name> [<version>]"
 remove.help = [[
diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua
index eaa321d5..c3f00a7c 100644
--- a/src/luarocks/search.lua
+++ b/src/luarocks/search.lua
@@ -11,7 +11,6 @@ local deps = require("luarocks.deps")
 local cfg = require("luarocks.cfg")
 local util = require("luarocks.util")
 
-util.add_run_function(search)
 search.help_summary = "Query the LuaRocks servers."
 search.help_arguments = "[--source] [--binary] { <name> [<version>] | --all }"
 search.help = [[
diff --git a/src/luarocks/show.lua b/src/luarocks/show.lua
index 01860e78..df992f5c 100644
--- a/src/luarocks/show.lua
+++ b/src/luarocks/show.lua
@@ -11,7 +11,6 @@ local deps = require("luarocks.deps")
 local fetch = require("luarocks.fetch")
 local manif = require("luarocks.manif")
 
-util.add_run_function(show)
 show.help_summary = "Show information about an installed rock."
 
 show.help = [[
diff --git a/src/luarocks/unpack.lua b/src/luarocks/unpack.lua
index 2face005..4e4d9a06 100644
--- a/src/luarocks/unpack.lua
+++ b/src/luarocks/unpack.lua
@@ -11,7 +11,6 @@ local build = require("luarocks.build")
 local dir = require("luarocks.dir")
 local cfg = require("luarocks.cfg")
 
-util.add_run_function(unpack)
 unpack.help_summary = "Unpack the contents of a rock."
 unpack.help_arguments = "[--force] {<rock>|<name> [<version>]}"
 unpack.help = [[
diff --git a/src/luarocks/upload.lua b/src/luarocks/upload.lua
index 3adc1704..5031b1ef 100644
--- a/src/luarocks/upload.lua
+++ b/src/luarocks/upload.lua
@@ -7,7 +7,6 @@ local pack = require("luarocks.pack")
 local cfg = require("luarocks.cfg")
 local Api = require("luarocks.upload.api")
 
-util.add_run_function(upload)
 upload.help_summary = "Upload a rockspec to the public rocks repository."
 upload.help_arguments = "[--skip-pack] [--api-key=<key>] [--force] <rockspec>"
 upload.help = [[
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index 4aa474ff..d27710c1 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -210,13 +210,6 @@ function util.parse_flags(...)
    return flags, unpack(out)
 end
 
--- Adds legacy 'run' function to a command module.
--- @param command table: command module with 'command' function,
--- the added 'run' function calls it after parseing command-line arguments.
-function util.add_run_function(command)
-   command.run = function(...) return command.command(util.parse_flags(...)) end
-end
-
 --- Merges contents of src on top of dst's contents.
 -- @param dst Destination table, which will receive src's contents.
 -- @param src Table which provides new contents to dst.
diff --git a/src/luarocks/validate.lua b/src/luarocks/validate.lua
index c4570aa4..f0452bbd 100644
--- a/src/luarocks/validate.lua
+++ b/src/luarocks/validate.lua
@@ -11,7 +11,6 @@ local build = require("luarocks.build")
 local install = require("luarocks.install")
 local util = require("luarocks.util")
 
-util.add_run_function(validate)
 validate.help_summary = "Sandboxed test of build/install of all packages in a repository."
 
 validate.help = [[
diff --git a/src/luarocks/write_rockspec.lua b/src/luarocks/write_rockspec.lua
index 33edeb1b..68c00cce 100644
--- a/src/luarocks/write_rockspec.lua
+++ b/src/luarocks/write_rockspec.lua
@@ -11,7 +11,6 @@ local persist = require("luarocks.persist")
 local type_check = require("luarocks.type_check")
 local util = require("luarocks.util")
 
-util.add_run_function(write_rockspec)
 write_rockspec.help_summary = "Write a template for a rockspec file."
 write_rockspec.help_arguments = "[--output=<file> ...] [<name>] [<version>] [<url>|<path>]"
 write_rockspec.help = [[
-- 
cgit v1.2.3-55-g6feb