Merge branch 'luarocks-3'

3 files changed, 19 insertions, 2 deletions

diff --git a/spec/config_spec.lua b/spec/config_spec.lua
index 4a7f4aea..cdb5ccc4 100644
--- a/spec/config_spec.lua
+++ b/spec/config_spec.lua
@@ -57,7 +57,8 @@ describe("LuaRocks config tests #blackbox #b_config", function()
       end)
       
       it("LuaRocks config missing user config", function()
-         assert.is_false(run.luarocks_bool("config --user-config", {LUAROCKS_CONFIG = "missing_file.lua"}))
+         local output = run.luarocks("config --user-config", {LUAROCKS_CONFIG = "missing_file.lua"})
+         assert.truthy(output:match("Warning"))
       end)
    end)
 
diff --git a/spec/show_spec.lua b/spec/show_spec.lua
index d07fdc31..0b046de0 100644
--- a/spec/show_spec.lua
+++ b/spec/show_spec.lua
@@ -54,6 +54,14 @@ describe("LuaRocks show tests #blackbox #b_show", function()
       it("LuaRocks show rock directory of luacov", function()
          local output = run.luarocks("show --rock-dir luacov")
       end)
+
+      it("LuaRocks show issues URL of luacov", function()
+         local output = run.luarocks("show --issues luacov")
+      end)
+      
+      it("LuaRocks show labels of luacov", function()
+         local output = run.luarocks("show --labels luacov")
+      end)
    end)
 
    it("LuaRocks show old version of luacov", function()
diff --git a/spec/unpack_spec.lua b/spec/unpack_spec.lua
index 1a8dfa7e..d629e225 100644
--- a/spec/unpack_spec.lua
+++ b/spec/unpack_spec.lua
@@ -50,7 +50,15 @@ describe("LuaRocks unpack tests #blackbox #b_unpack", function()
          os.remove("lua-cprint")
          test_env.remove_dir("cprint-0.1-2")
       end)
-      
+
+      -- #595 luarocks unpack of a git:// rockspec fails to copy the rockspec
+      it("LuaRocks unpack git:// rockspec", function()
+         assert.is_true(run.luarocks_bool("download --rockspec luazip"))
+         assert.is_true(run.luarocks_bool("unpack luazip-1.2.4-1.rockspec"))
+         assert.is_truthy(lfs.attributes("luazip-1.2.4-1/luazip/luazip-1.2.4-1.rockspec"))
+         test_env.remove_dir("luazip-1.2.4-1")
+      end)
+
       it("LuaRocks unpack binary", function()
          assert.is_true(run.luarocks_bool("build cprint"))
          assert.is_true(run.luarocks_bool("pack cprint"))