7 files changed, 75 insertions, 26 deletions

diff --git a/spec/build_spec.lua b/spec/build_spec.lua
index 1ce99089..682c6dcf 100644
--- a/spec/build_spec.lua
+++ b/spec/build_spec.lua
@@ -169,12 +169,10 @@ describe("LuaRocks build tests #blackbox #b_build", function()
       end)
 
       it("LuaRocks build missing external", function()
-         assert.is_true(test_env.need_luasocket())
          assert.is_false(run.luarocks_bool("build " .. testing_paths.testing_dir .. "/testfiles/missing_external-0.1-1.rockspec INEXISTENT_INCDIR=\"/invalid/dir\""))
       end)
       
       it("LuaRocks build invalid patch", function()
-         assert.is_true(test_env.need_luasocket())
          assert.is_false(run.luarocks_bool("build " .. testing_paths.testing_dir .. "/testfiles/invalid_patch-0.1-1.rockspec"))
       end)
    end)
diff --git a/spec/install_spec.lua b/spec/install_spec.lua
index 0e406e22..0b2ffb53 100644
--- a/spec/install_spec.lua
+++ b/spec/install_spec.lua
@@ -83,23 +83,24 @@ describe("LuaRocks install tests #blackbox #b_install", function()
       end)
       
       it("LuaRocks install only-deps of luasocket packed rock", function()
-         assert.is_true(test_env.need_luasocket())
-         local output = run.luarocks("install --only-deps " .. testing_paths.testing_cache .. "/luasocket-3.0rc1-1." .. test_env.platform .. ".rock")
+         assert.is_true(run.luarocks_bool("build --pack-binary-rock luasocket"))
+         local output = run.luarocks("install --only-deps " .. "luasocket-3.0rc1-1." .. test_env.platform .. ".rock")
          assert.are.same(output, "Successfully installed dependencies for luasocket 3.0rc1-1")
+         assert.is_true(os.remove("luasocket-3.0rc1-1." .. test_env.platform .. ".rock"))
+      end)
+
+      it("LuaRocks install reinstall", function()
+         assert.is_true(run.luarocks_bool("build --pack-binary-rock luasocket"))
+         assert.is_true(run.luarocks_bool("install " .. "luasocket-3.0rc1-1." .. test_env.platform .. ".rock"))
+         assert.is_true(run.luarocks_bool("install --deps-mode=none " .. "luasocket-3.0rc1-1." .. test_env.platform .. ".rock"))
+         assert.is_true(os.remove("luasocket-3.0rc1-1." .. test_env.platform .. ".rock"))
       end)
 
       it("LuaRocks install binary rock of cprint", function()
-         assert.is_true(test_env.need_luasocket())
          assert.is_true(run.luarocks_bool("build --pack-binary-rock cprint"))
          assert.is_true(run.luarocks_bool("install cprint-0.1-2." .. test_env.platform .. ".rock"))
          assert.is_true(os.remove("cprint-0.1-2." .. test_env.platform .. ".rock"))
-      end)
-
-      it("LuaRocks install reinstall", function()
-         assert.is_true(test_env.need_luasocket())
-         assert.is_true(run.luarocks_bool("install " .. testing_paths.testing_cache .. "/luasocket-3.0rc1-1." .. test_env.platform .. ".rock"))
-         assert.is_true(run.luarocks_bool("install --deps-mode=none " .. testing_paths.testing_cache .. "/luasocket-3.0rc1-1." .. test_env.platform .. ".rock"))
-      end)
+      end)     
    end)
 
    describe("New install functionality based on pull request 552", function()
diff --git a/spec/new_version_spec.lua b/spec/new_version_spec.lua
index 4e4d5d27..c4185b1d 100644
--- a/spec/new_version_spec.lua
+++ b/spec/new_version_spec.lua
@@ -30,11 +30,19 @@ describe("LuaRocks new_version tests #blackbox #b_new_version", function()
       it("LuaRocks new version invalid url", function()
          assert.is_true(run.luarocks_bool("download --rockspec abelhas 1.0"))
          assert.is_true(run.luarocks_bool("new_version abelhas-1.0-1.rockspec 1.1 http://luainvalid"))
+         assert.is.truthy(lfs.attributes("abelhas-1.1-1.rockspec"))
          test_env.remove_files(lfs.currentdir(), "abelhas--")
       end)
    end)
 
    describe("LuaRocks new_version more complex tests", function()
+      it("LuaRocks new version with remote spec", function()
+         assert.is_true(run.luarocks_bool("new_version https://luarocks.org/manifests/luarocks/luasocket-2.0.2-6.rockspec"))
+         assert.is.truthy(lfs.attributes("luasocket-2.0.2-6.rockspec"))
+         assert.is.truthy(lfs.attributes("luasocket-2.0.2-7.rockspec"))
+         test_env.remove_files(lfs.currentdir(), "luasocket--")
+      end)
+
       it("LuaRocks new_version of luacov", function()
          assert.is_true(run.luarocks_bool("download --rockspec luacov 0.11.0"))
          assert.is_true(run.luarocks_bool("new_version luacov-0.11.0-1.rockspec 0.2"))
diff --git a/spec/pack_spec.lua b/spec/pack_spec.lua
index 416184a8..aa827682 100644
--- a/spec/pack_spec.lua
+++ b/spec/pack_spec.lua
@@ -1,6 +1,7 @@
 local test_env = require("test/test_environment")
 local lfs = require("lfs")
 local run = test_env.run
+local testing_paths = test_env.testing_paths
 
 test_env.unload_luarocks()
 
@@ -21,6 +22,10 @@ describe("LuaRocks pack tests #blackbox #b_pack", function()
       assert.is_true(run.luarocks_bool("pack luacov"))
       assert.is_true(test_env.remove_files(lfs.currentdir(), "luacov-"))
    end)
+
+   it("LuaRocks pack invalid rockspec", function()
+      assert.is_false(run.luarocks_bool("pack " .. testing_paths.testing_dir .. "/testfiles/invaild_validate-args-1.5.4-1.rockspec"))
+   end)
    
    it("LuaRocks pack src", function()
       assert.is_true(run.luarocks_bool("install luasec"))
diff --git a/spec/remove_spec.lua b/spec/remove_spec.lua
index 41c6348a..c7f83b95 100644
--- a/spec/remove_spec.lua
+++ b/spec/remove_spec.lua
@@ -44,8 +44,11 @@ describe("LuaRocks remove tests #blackbox #b_remove", function()
    end)
 
    describe("LuaRocks remove more complex tests", function()
+      before_each(function()
+         assert.is_true(test_env.need_rock("luasocket"))
+      end)
+
       it("LuaRocks remove fail, break dependencies", function()
-         assert.is_true(test_env.need_luasocket())
          assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasocket"))
          assert.is_true(run.luarocks_bool("build lualogging"))
 
@@ -54,7 +57,6 @@ describe("LuaRocks remove tests #blackbox #b_remove", function()
       end)
       
       it("LuaRocks remove force", function()
-         assert.is_true(test_env.need_luasocket())
          assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasocket"))
          assert.is_true(run.luarocks_bool("build lualogging"))
 
@@ -64,7 +66,6 @@ describe("LuaRocks remove tests #blackbox #b_remove", function()
       end)
       
       it("LuaRocks remove force fast", function()
-         assert.is_true(test_env.need_luasocket())
          assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasocket"))
          assert.is_true(run.luarocks_bool("build lualogging"))
 
diff --git a/test/test_environment.lua b/test/test_environment.lua
index 6de7a4e2..eb545a47 100644
--- a/test/test_environment.lua
+++ b/test/test_environment.lua
@@ -14,6 +14,7 @@ USAGE
 ARGUMENTS
    env=<type>     Set type of environment to use ("minimal" or "full",
                   default: "minimal").
+   noreset        Don't reset environment after each test
    clean          Remove existing testing environment.
    travis         Add if running on TravisCI.
    os=<type>      Set OS ("linux", "osx", or "windows").
@@ -96,10 +97,13 @@ end
 function test_env.set_args()
    -- if at least Lua/LuaJIT version argument was found on input start to parse other arguments to env. variables
    test_env.TYPE_TEST_ENV = "minimal"
+   test_env.RESET_ENV = true
 
    for _, argument in ipairs(arg) do
       if argument:find("^env=") then
          test_env.TYPE_TEST_ENV = argument:match("^env=(.*)$")
+      elseif argument == "noreset" then
+         test_env.RESET_ENV = false
       elseif argument == "clean" then
          test_env.TEST_ENV_CLEAN = true
       elseif argument == "travis" then
@@ -333,6 +337,7 @@ local function reset_environment(testing_paths, md5sums)
       test_env.remove_dir(testing_paths.testing_tree)
       execute_bool("cp -a " .. testing_paths.testing_tree_copy .. "/. " .. testing_paths.testing_tree)
    end
+
    if testing_sys_tree_md5 ~= md5sums.testing_sys_tree_copy_md5 then
       test_env.remove_dir(testing_paths.testing_sys_tree)
       execute_bool("cp -a " .. testing_paths.testing_sys_tree_copy .. "/. " .. testing_paths.testing_sys_tree)
@@ -403,21 +408,17 @@ function test_env.setup_specs(extra_rocks)
       end
    end
 
-   reset_environment(test_env.testing_paths, test_env.md5sums, test_env.env_variables)
+   if test_env.RESET_ENV then
+      reset_environment(test_env.testing_paths, test_env.md5sums, test_env.env_variables)
+   end
 end
 
---- Helper function for tests which needs luasocket installed
-function test_env.need_luasocket()
-   if test_env.run.luarocks_nocov("show luasocket") then
+--- Test if required rock is installed if not, install it
+function test_env.need_rock(rock)
+   if test_env.run.luarocks_nocov("show " .. rock) then
       return true
    else
-      local testing_cache = test_env.testing_paths.testing_cache .. "/"
-      local luasocket_rock = "luasocket-3.0rc1-1." .. test_env.platform .. ".rock"
-      if not exists(testing_cache .. luasocket_rock) then
-         test_env.run.luarocks_nocov("build --pack-binary-rock luasocket 3.0rc1-1")
-         os.rename(luasocket_rock, testing_cache .. luasocket_rock)
-      end
-      return test_env.run.luarocks_nocov("install " .. testing_cache .. luasocket_rock)
+      return test_env.run.luarocks_nocov("install " .. rock)
    end
 end
 
diff --git a/test/testfiles/invalid_validate-args-1.5.4-1.rockspec b/test/testfiles/invalid_validate-args-1.5.4-1.rockspec
new file mode 100644
index 00000000..0b4d807d
--- /dev/null
+++ b/test/testfiles/invalid_validate-args-1.5.4-1.rockspec
@@ -0,0 +1,35 @@
+package = 'validate-args'
+version = '1.5.4-1'
+source = {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{++{
+  url = "https://bitbucket.org/djerius/validate.args/downloads/validate-args-1.5.4.tar.gz"
+}
+
+description = {
+   summary = "Function argument validation",
+   detailed = [[
+         validate.args is a Lua module that provides a framework for
+         validation of arguments to Lua functions as well as complex data
+         structures. The included validate.inplace module provides "live"
+         validation during assignment of values to elements in tables. ]],
+   license = "GPL-3",
+
+}
+
+dependencies = {
+   "lua >= 5.1"
+}
+
+build = {
+
+   type = "builtin",
+
+   modules = {
+      ["validate.args"] = "validate/args.lua",
+      ["validate.inplace"] = "validate/inplace.lua",
+   },
+
+   copy_directories = {
+   "doc", "tests"
+   }
+
+}