23 files changed, 13 insertions, 49 deletions

diff --git a/spec/add_spec.lua b/spec/add_spec.lua
index e417f974..5d020859 100644
--- a/spec/add_spec.lua
+++ b/spec/add_spec.lua
@@ -1,8 +1,6 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local add = require("luarocks.add")
 
 local extra_rocks = {
    "/luasocket-3.0rc1-1.src.rock",
@@ -43,4 +41,4 @@ expose("LuaRocks add tests #blackbox #b_add", function()
          assert.is_false(run.luarocks_admin_bool("--server=\"localhost@/tmp/luarocks_testing\" add " .. testing_paths.testing_server .. "luasocket-3.0rc1-1.src.rock"))
       end)
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/build_spec.lua b/spec/build_spec.lua
index 6665de0b..ee88cce4 100644
--- a/spec/build_spec.lua
+++ b/spec/build_spec.lua
@@ -2,7 +2,6 @@ local test_env = require("test/test_environment")
 local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local build = require("luarocks.build")
 
 local extra_rocks = {
    "/lmathx-20120430.51-1.src.rock",
diff --git a/spec/config_spec.lua b/spec/config_spec.lua
index f6cabd8c..a7842811 100644
--- a/spec/config_spec.lua
+++ b/spec/config_spec.lua
@@ -2,7 +2,6 @@ local test_env = require("test/test_environment")
 local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local cfg = require("luarocks.cfg")
 
 expose("LuaRocks config tests #blackbox #b_config", function()
    
@@ -87,4 +86,4 @@ expose("LuaRocks config tests #blackbox #b_config", function()
          test_env.remove_dir(testing_paths.testing_lrprefix)
       end)
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/deps_spec.lua b/spec/deps_spec.lua
index ce784080..3a0cda74 100644
--- a/spec/deps_spec.lua
+++ b/spec/deps_spec.lua
@@ -2,7 +2,6 @@ local test_env = require("test/test_environment")
 local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local deps = require("luarocks.deps")
 
 local extra_rocks = {
    "/lxsh-0.8.6-2.src.rock",
@@ -112,4 +111,4 @@ expose("LuaRocks deps tests #blackbox #b_deps", function()
       assert.is.falsy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lxsh"))
       assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh"))
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/doc_spec.lua b/spec/doc_spec.lua
index 476b8ea8..d0d6ff1e 100644
--- a/spec/doc_spec.lua
+++ b/spec/doc_spec.lua
@@ -1,8 +1,6 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local doc = require("luarocks.doc")
 
 local extra_rocks = {
   "/luarepl-0.4-1.src.rock"
diff --git a/spec/download_spec.lua b/spec/download_spec.lua
index 9b5d9e2e..d1216d33 100644
--- a/spec/download_spec.lua
+++ b/spec/download_spec.lua
@@ -2,7 +2,6 @@ local test_env = require("test/test_environment")
 local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local download = require("luarocks.download")
 
 local extra_rocks = {
    "/validate-args-1.5.4-1.rockspec"
diff --git a/spec/fetch_spec.lua b/spec/fetch_spec.lua
index 1f298733..05a709e4 100644
--- a/spec/fetch_spec.lua
+++ b/spec/fetch_spec.lua
@@ -1,5 +1,4 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
 
 test_env.unload_luarocks()
 local fetch = require("luarocks.fetch")
@@ -13,4 +12,4 @@ describe("Luarocks fetch test #whitebox #w_fetch", function()
       assert.are.same("parser.moon", fetch.url_to_base_dir("git://github.com/Cirru/parser.moon"))
       assert.are.same("v0.3", fetch.url_to_base_dir("https://github.com/hishamhm/lua-compat-5.2/archive/v0.3"))
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/help_spec.lua b/spec/help_spec.lua
index 0f40dd38..08f6f1f1 100644
--- a/spec/help_spec.lua
+++ b/spec/help_spec.lua
@@ -1,8 +1,6 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local help = require("luarocks.help")
 
 expose("LuaRocks help tests #blackbox #b_help", function()
 
@@ -26,4 +24,4 @@ expose("LuaRocks help tests #blackbox #b_help", function()
    it("LuaRocks-admin help with no flags/arguments", function()
       assert.is_true(run.luarocks_admin_bool("help"))
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/install_spec.lua b/spec/install_spec.lua
index 306bbbc1..a598f324 100644
--- a/spec/install_spec.lua
+++ b/spec/install_spec.lua
@@ -2,7 +2,6 @@ local test_env = require("test/test_environment")
 local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local install = require("luarocks.install")
 
 local extra_rocks = {
    "/cprint-0.1-2.src.rock",
@@ -127,4 +126,4 @@ expose("LuaRocks install tests #blackbox #b_install", function()
          assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/say/1.0-1"))
       end)
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/lint_spec.lua b/spec/lint_spec.lua
index cba80a3e..58c87c4e 100644
--- a/spec/lint_spec.lua
+++ b/spec/lint_spec.lua
@@ -1,8 +1,6 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local lint = require("luarocks.lint")
 
 local extra_rocks = {
    "/validate-args-1.5.4-1.rockspec"
@@ -48,4 +46,4 @@ expose("LuaRocks lint tests #blackbox #b_lint", function()
          assert.is_false(run.luarocks_bool("lint " .. testing_paths.testing_dir .. "/testfiles/no_build_table-1.0-1.rockspec"))
       end)
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/list_spec.lua b/spec/list_spec.lua
index 545483df..edc310ca 100644
--- a/spec/list_spec.lua
+++ b/spec/list_spec.lua
@@ -1,8 +1,6 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local list = require("luarocks.list")
 
 local extra_rocks = {
    "/say-1.0-1.src.rock",
diff --git a/spec/make_manifest_spec.lua b/spec/make_manifest_spec.lua
index c6cb1328..a5b19eff 100644
--- a/spec/make_manifest_spec.lua
+++ b/spec/make_manifest_spec.lua
@@ -1,8 +1,6 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local make_manifest = require("luarocks.make_manifest")
 
 expose("LuaRocks make_manifest tests #blackbox #b_make_manifest", function()
         
@@ -16,4 +14,4 @@ expose("LuaRocks make_manifest tests #blackbox #b_make_manifest", function()
          assert.is_true(run.luarocks_admin_bool("make_manifest"))
       end)
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/make_spec.lua b/spec/make_spec.lua
index f70bb7e9..b0177fc5 100644
--- a/spec/make_spec.lua
+++ b/spec/make_spec.lua
@@ -2,7 +2,6 @@ local test_env = require("test/test_environment")
 local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local make = require("luarocks.make")
 
 local extra_rocks = {
    "/lpeg-0.12-1.src.rock",
@@ -96,4 +95,4 @@ expose("LuaRocks make tests #blackbox #b_make", function()
          assert.is.truthy(lfs.attributes("lxsh-0.8.6-2.all.rock"))
       end)
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/new_version_spec.lua b/spec/new_version_spec.lua
index 57014226..685d31b4 100644
--- a/spec/new_version_spec.lua
+++ b/spec/new_version_spec.lua
@@ -2,7 +2,6 @@ local test_env = require("test/test_environment")
 local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local new_version = require("luarocks.new_version")
 
 local extra_rocks = {
    "/abelhas-1.0-1.rockspec"
@@ -50,4 +49,4 @@ expose("LuaRocks new_version tests #blackbox #b_new_version", function()
          test_env.remove_files(lfs.currentdir(), "luacov--")
       end)
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/pack_spec.lua b/spec/pack_spec.lua
index a07e7ed2..39d8bc5c 100644
--- a/spec/pack_spec.lua
+++ b/spec/pack_spec.lua
@@ -2,7 +2,6 @@ local test_env = require("test/test_environment")
 local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local pack = require("luarocks.pack")
 
 local extra_rocks = {
         "/luasec-0.6-1.rockspec",
diff --git a/spec/path_spec.lua b/spec/path_spec.lua
index 266ada89..cffc186b 100644
--- a/spec/path_spec.lua
+++ b/spec/path_spec.lua
@@ -1,8 +1,6 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local path = require("luarocks.path")
 
 expose("LuaRocks path tests #blackbox #b_path", function()
    before_each(function()
diff --git a/spec/purge_spec.lua b/spec/purge_spec.lua
index 639f96f3..f5515cb5 100644
--- a/spec/purge_spec.lua
+++ b/spec/purge_spec.lua
@@ -1,8 +1,6 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local purge = require("luarocks.purge")
 
 expose("LuaRocks purge tests #blackbox #b_purge", function()   
    before_each(function()
diff --git a/spec/refresh_cache_spec.lua b/spec/refresh_cache_spec.lua
index 27a95e5c..ef8c3a12 100644
--- a/spec/refresh_cache_spec.lua
+++ b/spec/refresh_cache_spec.lua
@@ -1,8 +1,6 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local refresh_cache = require("luarocks.refresh_cache")
 
 expose("LuaRocks refresh_cache tests #blackbox #b_refresh_cache", function()
         
@@ -16,4 +14,4 @@ expose("LuaRocks refresh_cache tests #blackbox #b_refresh_cache", function()
          assert.is_true(run.luarocks_admin_bool("--server=testing refresh_cache"))
       end)
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/remove_spec.lua b/spec/remove_spec.lua
index a94673a8..1b3cda7e 100644
--- a/spec/remove_spec.lua
+++ b/spec/remove_spec.lua
@@ -2,7 +2,6 @@ local test_env = require("test/test_environment")
 local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local remove = require("luarocks.remove")
 
 local extra_rocks = {
    "/abelhas-1.0-1.rockspec",
@@ -82,4 +81,4 @@ expose("LuaRocks remove tests #blackbox #b_remove", function()
    it("LuaRocks-admin remove missing", function()
       assert.is_false(run.luarocks_admin_bool("--server=testing remove"))
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/search_spec.lua b/spec/search_spec.lua
index a0258942..8e84931b 100644
--- a/spec/search_spec.lua
+++ b/spec/search_spec.lua
@@ -1,8 +1,6 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local search = require("luarocks.search")
 
 local extra_rocks = {
 "/lzlib-0.4.1.53-1.src.rock"
@@ -39,4 +37,4 @@ expose("LuaRocks search tests #blackbox #b_search", function()
       local num = 123
       assert.is_true(run.luarocks_bool("search " .. num))
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/show_spec.lua b/spec/show_spec.lua
index 85797eb6..c2f70c92 100644
--- a/spec/show_spec.lua
+++ b/spec/show_spec.lua
@@ -1,8 +1,6 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local show = require("luarocks.show")
 
 expose("LuaRocks show tests #blackbox #b_show", function()
    
diff --git a/spec/unpack_spec.lua b/spec/unpack_spec.lua
index efe902f5..3930a583 100644
--- a/spec/unpack_spec.lua
+++ b/spec/unpack_spec.lua
@@ -1,8 +1,6 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local unpack = require("luarocks.unpack")
 
 local extra_rocks = {
    "/cprint-0.1-2.src.rock",
diff --git a/spec/upload_spec.lua b/spec/upload_spec.lua
index daf40d61..f0125966 100644
--- a/spec/upload_spec.lua
+++ b/spec/upload_spec.lua
@@ -1,8 +1,6 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
 
 test_env.unload_luarocks()
-local upload = require("luarocks.upload")
 
 local extra_rocks = {
    "/lua-cjson-2.1.0-1.src.rock"