Rename luarocks.rep to luarocks.repos. Closes #45.

8 files changed, 28 insertions, 28 deletions

diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index e9b3adc1..6ffa0e79 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -6,7 +6,7 @@ module("luarocks.build", package.seeall)
 local pack = require("luarocks.pack")
 local path = require("luarocks.path")
 local util = require("luarocks.util")
-local rep = require("luarocks.rep")
+local repos = require("luarocks.repos")
 local fetch = require("luarocks.fetch")
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
@@ -142,8 +142,8 @@ function build_rockspec(rockspec_file, need_to_fetch, minimal_mode, no_deps)
    end
 
    local name, version = rockspec.name, rockspec.version
-   if rep.is_installed(name, version) then
-      rep.delete_version(name, version)
+   if repos.is_installed(name, version) then
+      repos.delete_version(name, version)
    end
 
    if not minimal_mode then
@@ -242,15 +242,15 @@ function build_rockspec(rockspec_file, need_to_fetch, minimal_mode, no_deps)
    ok, err = manif.make_rock_manifest(name, version)
    if err then return nil, err end
 
-   ok, err = rep.deploy_files(name, version, rep.should_wrap_bin_scripts(rockspec))
+   ok, err = repos.deploy_files(name, version, repos.should_wrap_bin_scripts(rockspec))
    if err then return nil, err end
    
    util.remove_scheduled_function(rollback)
    rollback = util.schedule_function(function()
-      rep.delete_version(name, version)
+      repos.delete_version(name, version)
    end)
 
-   ok, err = rep.run_hook(rockspec, "post_install")
+   ok, err = repos.run_hook(rockspec, "post_install")
    if err then return nil, err end
 
    ok, err = manif.update_manifest(name, version)
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index 0a779b86..6b5ea85f 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -4,7 +4,7 @@
 module("luarocks.install", package.seeall)
 
 local path = require("luarocks.path")
-local rep = require("luarocks.rep")
+local repos = require("luarocks.repos")
 local fetch = require("luarocks.fetch")
 local util = require("luarocks.util")
 local fs = require("luarocks.fs")
@@ -37,8 +37,8 @@ function install_binary_rock(rock_file, no_deps)
    if arch ~= "all" and arch ~= cfg.arch then
       return nil, "Incompatible architecture "..arch, "arch"
    end
-   if rep.is_installed(name, version) then
-      rep.delete_version(name, version)
+   if repos.is_installed(name, version) then
+      repos.delete_version(name, version)
    end
    
    local rollback = util.schedule_function(function()
@@ -77,15 +77,15 @@ function install_binary_rock(rock_file, no_deps)
       wrap_bin_scripts = false
    end
 
-   ok, err = rep.deploy_files(name, version, rep.should_wrap_bin_scripts(rockspec))
+   ok, err = repos.deploy_files(name, version, repos.should_wrap_bin_scripts(rockspec))
    if err then return nil, err end
 
    util.remove_scheduled_function(rollback)
    rollback = util.schedule_function(function()
-      rep.delete_version(name, version)
+      repos.delete_version(name, version)
    end)
 
-   ok, err = rep.run_hook(rockspec, "post_install")
+   ok, err = repos.run_hook(rockspec, "post_install")
    if err then return nil, err end
    
    ok, err = manif.update_manifest(name, version)
diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua
index 6b05b749..2c745f0b 100644
--- a/src/luarocks/manif.lua
+++ b/src/luarocks/manif.lua
@@ -14,7 +14,7 @@ local search = require("luarocks.search")
 local util = require("luarocks.util")
 local cfg = require("luarocks.cfg")
 local path = require("luarocks.path")
-local rep = require("luarocks.rep")
+local repos = require("luarocks.repos")
 local deps = require("luarocks.deps")
 
 rock_manifest_cache = {}
@@ -187,9 +187,9 @@ end
 -- @param manifest table: a manifest table.
 local function update_dependencies(manifest)
    for pkg, versions in pairs(manifest.repository) do
-      for version, repos in pairs(versions) do
+      for version, repositories in pairs(versions) do
          local current = pkg.." "..version
-         for _, repo in ipairs(repos) do
+         for _, repo in ipairs(repositories) do
             if repo.arch == "installed" then
                local missing
                repo.dependencies, missing = deps.scan_deps({}, {}, manifest, pkg, version)
@@ -230,8 +230,8 @@ local function store_results(results, manifest)
                if not rock_manifest then
                   return nil, "rock_manifest file not found for "..name.." "..version.." - not a LuaRocks 2 tree?"
                end
-               entrytable.modules = store_package_items(rep.package_modules, name, version, manifest.modules)
-               entrytable.commands = store_package_items(rep.package_commands, name, version, manifest.commands)
+               entrytable.modules = store_package_items(repos.package_modules, name, version, manifest.modules)
+               entrytable.commands = store_package_items(repos.package_commands, name, version, manifest.commands)
             end
             table.insert(versiontable, entrytable)
          end
diff --git a/src/luarocks/pack.lua b/src/luarocks/pack.lua
index f7a7ad12..d8f0b2ef 100644
--- a/src/luarocks/pack.lua
+++ b/src/luarocks/pack.lua
@@ -4,7 +4,7 @@
 module("luarocks.pack", package.seeall)
 
 local path = require("luarocks.path")
-local rep = require("luarocks.rep")
+local repos = require("luarocks.repos")
 local fetch = require("luarocks.fetch")
 local fs = require("luarocks.fs")
 local cfg = require("luarocks.cfg")
@@ -137,7 +137,7 @@ local function do_pack_binary_rock(name, version)
    end
    
    fs.change_dir(temp_dir)
-   if not is_binary and not rep.has_binaries(name, version) then
+   if not is_binary and not repos.has_binaries(name, version) then
       rock_file = rock_file:gsub("%."..cfg.arch:gsub("%-","%%-").."%.", ".all.")
    end
    fs.delete(rock_file)
diff --git a/src/luarocks/remove.lua b/src/luarocks/remove.lua
index b22d1ab6..a9d97540 100644
--- a/src/luarocks/remove.lua
+++ b/src/luarocks/remove.lua
@@ -6,7 +6,7 @@ module("luarocks.remove", package.seeall)
 local search = require("luarocks.search")
 local deps = require("luarocks.deps")
 local fetch = require("luarocks.fetch")
-local rep = require("luarocks.rep")
+local repos = require("luarocks.repos")
 local path = require("luarocks.path")
 local util = require("luarocks.util")
 local cfg = require("luarocks.cfg")
@@ -62,7 +62,7 @@ local function delete_versions(name, versions)
 
    for version, _ in pairs(versions) do
       util.printout("Removing "..name.." "..version.."...")
-      local ok, err = rep.delete_version(name, version)
+      local ok, err = repos.delete_version(name, version)
       if not ok then return nil, err end
    end
    
diff --git a/src/luarocks/rep.lua b/src/luarocks/repos.lua
index 5bb5fed5..e6f0c5f7 100644
--- a/src/luarocks/rep.lua
+++ b/src/luarocks/repos.lua
@@ -1,6 +1,6 @@
 
 --- Functions for managing the repository on disk.
-module("luarocks.rep", package.seeall)
+module("luarocks.repos", package.seeall)
 
 local fs = require("luarocks.fs")
 local path = require("luarocks.path")
diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua
index 9c53632a..4e0318c7 100644
--- a/src/luarocks/search.lua
+++ b/src/luarocks/search.lua
@@ -297,9 +297,9 @@ function print_results(results, show_repo, long)
    
    for package, versions in util.sortedpairs(results) do
       util.printout(package)
-      for version, repos in util.sortedpairs(versions, deps.compare_versions) do
+      for version, repositories in util.sortedpairs(versions, deps.compare_versions) do
          if show_repo then
-            for _, repo in ipairs(repos) do
+            for _, repo in ipairs(repositories) do
                util.printout("   "..version.." ("..repo.arch..") - "..repo.repo)
             end
          else
@@ -319,8 +319,8 @@ end
 local function split_source_and_binary_results(results)
    local sources, binaries = {}, {}
    for name, versions in pairs(results) do
-      for version, repos in pairs(versions) do
-         for _, repo in ipairs(repos) do
+      for version, repositories in pairs(versions) do
+         for _, repo in ipairs(repositories) do
             local where = sources
             if repo.arch == "all" or repo.arch == cfg.arch then
                where = binaries
diff --git a/src/luarocks/show.lua b/src/luarocks/show.lua
index 7255ea63..5a052b58 100644
--- a/src/luarocks/show.lua
+++ b/src/luarocks/show.lua
@@ -82,9 +82,9 @@ function run(...)
    local package, versions = util.sortedpairs(results)()
    --question: what do we do about multiple versions? This should
    --give us the latest version on the last repo (which is usually the global one)
-   for vs, repos in util.sortedpairs(versions, deps.compare_versions) do
+   for vs, repositories in util.sortedpairs(versions, deps.compare_versions) do
       if not version then version = vs end
-      for _, rp in ipairs(repos) do repo_url = rp.repo end
+      for _, rp in ipairs(repositories) do repo_url = rp.repo end
    end