Merge branch 'master' into luarocks-3

Conflicts:
	src/luarocks/deps.lua

3 files changed, 52 insertions, 23 deletions

diff --git a/test/testing.bat b/test/testing.bat
index 319e12c3..7083678b 100644
--- a/test/testing.bat
+++ b/test/testing.bat
@@ -1,7 +1,7 @@
 @echo off
 Setlocal EnableDelayedExpansion EnableExtensions
 
-if not defined LUAROCKS_REPO set LUAROCKS_REPO=http://rocks.moonscript.org
+if not defined LUAROCKS_REPO set LUAROCKS_REPO=https://luarocks.org
 
 appveyor DownloadFile %LUAROCKS_REPO%/stdlib-41.0.0-1.src.rock
 luarocks build stdlib
diff --git a/test/testing.lua b/test/testing.lua
index 63dead2b..6d4b4b05 100644
--- a/test/testing.lua
+++ b/test/testing.lua
@@ -86,6 +86,7 @@ local tests = {
    fail_arg_string_followed_by_flag = function() return run "$luarocks --server --porcelain" end,
    fail_arg_string_unknown = function() return run "$luarocks --invalid-flag=abc" end,
    test_empty_list = function() return run "$luarocks list" end,
+   test_list_outdated = function () return run "$luarocks list --outdated" end,
    fail_sysconfig_err = function()
       mkdir "$testing_lrprefix/etc/luarocks"
       file_set_contents("$testing_lrprefix/etc/luarocks/config.lua", "aoeui")
@@ -441,6 +442,11 @@ local tests = {
       return run "$luarocks install luarepl"
          and run "$luarocks doc luarepl"
    end,
+   test_doc_home = function()
+      return run "$luarocks install luacov"
+         and run "$luarocks doc luacov --home"
+   end,
+   fail_doc_invalid = function () return run "$luarocks doc invalid" end,
 
    -- Tests for https://github.com/keplerproject/luarocks/issues/375
    test_fetch_base_dir = function()
diff --git a/test/testing.sh b/test/testing.sh
index a198c2f2..3a132a2b 100755
--- a/test/testing.sh
+++ b/test/testing.sh
@@ -127,20 +127,15 @@ upload_servers = {
 EOF
 cat <<EOF > $testing_dir/luacov.config
 return {
-  ["configfile"] = ".luacov",
-  ["statsfile"] = "$testing_dir/luacov.stats.out",
-  ["reportfile"] = "$testing_dir/luacov.report.out",
-  runreport = false,
-  deletestats = false,
-  ["include"] = {},
-  ["exclude"] = {
-    "luacov$",
-    "luacov%.reporter$",
-    "luacov%.defaults$",
-    "luacov%.runner$",
-    "luacov%.stats$",
-    "luacov%.tick$",
-  },
+   statsfile = "$testing_dir/luacov.stats.out",
+   reportfile = "$testing_dir/luacov.report.out",
+   modules = {
+      ["luarocks"] = "src/bin/luarocks",
+      ["luarocks-admin"] = "src/bin/luarocks-admin",
+      ["luarocks.*"] = "src",
+      ["luarocks.*.*"] = "src",
+      ["luarocks.*.*.*"] = "src"
+   }
 }
 EOF
 
@@ -218,7 +213,7 @@ srcdir_luasocket=luasocket-3.0-rc1
 version_cprint=0.1
 verrev_cprint=0.1-2
 
-version_luacov=0.8
+version_luacov=0.9.1
 verrev_luacov=${version_luacov}-1
 version_lxsh=0.8.6
 version_validate_args=1.5.4
@@ -265,7 +260,7 @@ luajit_luarocks="luajit -e require('luacov.runner')('$testing_dir/luacov.config'
 mkdir -p "$testing_server"
 (
    cd "$testing_server"
-   luarocks_repo="http://rocks.moonscript.org"
+   luarocks_repo="https://luarocks.org"
    get() { [ -e `basename "$1"` ] || wget -c "$1"; }
    get "$luarocks_repo/luacov-${verrev_luacov}.src.rock"
    get "$luarocks_repo/luacov-${verrev_luacov}.rockspec"
@@ -380,7 +375,10 @@ fail_arg_string_no_parameter() { $luarocks --server; }
 fail_arg_string_followed_by_flag() { $luarocks --server --porcelain; }
 fail_arg_string_unknown() { $luarocks --invalid-flag=abc; }
 
+fail_invalid_assignment() { $luarocks invalid=5; }
+
 test_empty_list() { $luarocks list; }
+test_list_outdated() { $luarocks list --outdated; }
 
 fail_sysconfig_err() { local err=0; local scdir="$testing_lrprefix/etc/luarocks/"; mkdir -p "$scdir"; local sysconfig="$scdir/config.lua"; echo "aoeui" > "$sysconfig"; echo $sysconfig; $luarocks list; err=$?; rm "$sysconfig"; return "$err"; }
 fail_sysconfig_default_err() { local err=0; local scdir="$testing_lrprefix/etc/luarocks/"; mkdir -p "$scdir"; local sysconfig="$scdir/config-$luashortversion.lua"; echo "aoeui" > "$sysconfig"; echo $sysconfig; $luarocks list; err=$?; rm "$sysconfig"; return "$err"; }
@@ -415,6 +413,12 @@ fail_build_permissions() { $luarocks build --tree=/usr lpeg; }
 fail_build_permissions_parent() { $luarocks build --tree=/usr/invalid lpeg; }
 
 test_build_verbose() { $luarocks build --verbose lpeg; }
+test_build_timeout() { $luarocks --timeout=10; }
+fail_build_timeout_invalid() { $luarocks --timeout=abc; }
+test_build_branch() { $luarocks build --branch=master lpeg; }
+fail_build_invalid_entry_deps_mode() { $luarocks build --deps-mode=123 lpeg; }
+test_build_only_server() { $luarocks --only-server=testing; }
+test_build_only_sources() { $luarocks build --only-sources="http://example.com" lpeg; }
 fail_build_blank_arg() { $luarocks build --tree="" lpeg; }
 test_build_withpatch() { need_luasocket; $luarocks build luadoc; }
 test_build_diffversion() { $luarocks build luacov ${version_luacov}; }
@@ -427,6 +431,8 @@ test_build_only_deps_rockspec() { $luarocks download --rockspec lxsh ${verrev_lx
 test_build_only_deps_src_rock() { $luarocks download --source lxsh ${verrev_lxsh} && $luarocks build ./lxsh-${verrev_lxsh}.src.rock --only-deps && { $luarocks show lxsh; [ $? -ne 0 ]; }; }
 test_build_only_deps() { $luarocks build luasec --only-deps && { $luarocks show luasec; [ $? -ne 0 ]; }; }
 test_install_only_deps() { $luarocks install lxsh ${verrev_lxsh} --only-deps && { $luarocks show lxsh; [ $? -ne 0 ]; }; }
+test_build_no_deps() { $luarocks build luasec --nodeps; }
+test_install_no_deps() { $luarocks install luasec --nodeps; }
 fail_build_missing_external() { $luarocks build "$testing_dir/testfiles/missing_external-0.1-1.rockspec" INEXISTENT_INCDIR="/invalid/dir"; }
 fail_build_invalidpatch() { need_luasocket; $luarocks build "$testing_dir/testfiles/invalid_patch-0.1-1.rockspec"; }
 
@@ -461,12 +467,15 @@ test_list() { $luarocks list; }
 test_list_porcelain() { $luarocks list --porcelain; }
 
 test_make_with_rockspec() { rm -rf ./luasocket-${verrev_luasocket} && $luarocks download --source luasocket && $luarocks unpack ./luasocket-${verrev_luasocket}.src.rock && cd luasocket-${verrev_luasocket}/${srcdir_luasocket}  && $luarocks make luasocket-${verrev_luasocket}.rockspec && cd ../.. && rm -rf ./luasocket-${verrev_luasocket}; }
-test_make_default_rockspec() { rm -rf ./lxsh-${verrev_lxsh} &&  $luarocks download --source lxsh ${verrev_lxsh} &&  $luarocks unpack ./lxsh-${verrev_lxsh}.src.rock &&  cd lxsh-${verrev_lxsh}/lxsh-${version_lxsh}-1  &&  $luarocks make && cd ../.. && rm -rf ./lxsh-${verrev_lxsh}; }
+test_make_default_rockspec() { rm -rf ./lxsh-${verrev_lxsh} &&  $luarocks download --source lxsh ${verrev_lxsh} &&  $luarocks unpack ./lxsh-${verrev_lxsh}.src.rock &&  cd lxsh-${verrev_lxsh}/lxsh-${version_lxsh}-1  &&  $luarocks new_version lxsh-${verrev_lxsh}.rockspec  && $luarocks make && cd ../.. && rm -rf ./lxsh-${verrev_lxsh}; }
+test_make_unnamed_rockspec() { rm -rf ./lxsh-${verrev_lxsh} &&  $luarocks download --source lxsh ${verrev_lxsh} &&  $luarocks unpack ./lxsh-${verrev_lxsh}.src.rock &&  cd lxsh-${verrev_lxsh}/lxsh-${version_lxsh}-1  &&  cp lxsh-${verrev_lxsh}.rockspec rockspec && $luarocks make && cd ../.. && rm -rf ./lxsh-${verrev_lxsh}; }
+fail_make_ambiguous_rockspec() { rm -rf ./lxsh-${verrev_lxsh} &&  $luarocks download --source lxsh ${verrev_lxsh} &&  $luarocks unpack ./lxsh-${verrev_lxsh}.src.rock &&  cd lxsh-${verrev_lxsh}/lxsh-${version_lxsh}-1  &&  cp lxsh-${verrev_lxsh}.rockspec lxsh2-${verrev_lxsh}.rockspec && $luarocks make && cd ../.. && rm -rf ./lxsh-${verrev_lxsh}; }
+fail_make_ambiguous_unnamed_rockspec() { rm -rf ./lxsh-${verrev_lxsh} &&  $luarocks download --source lxsh ${verrev_lxsh} &&  $luarocks unpack ./lxsh-${verrev_lxsh}.src.rock &&  cd lxsh-${verrev_lxsh}/lxsh-${version_lxsh}-1  &&  mv lxsh-${verrev_lxsh}.rockspec 1_rockspec && cp 1_rockspec 2_rockspec && $luarocks make && cd ../.. && rm -rf ./lxsh-${verrev_lxsh}; }
 test_make_pack_binary_rock() { rm -rf ./lxsh-${verrev_lxsh} &&  $luarocks download --source lxsh ${verrev_lxsh} &&  $luarocks unpack ./lxsh-${verrev_lxsh}.src.rock &&  cd lxsh-${verrev_lxsh}/lxsh-${version_lxsh}-1  &&  $luarocks make --deps-mode=none --pack-binary-rock &&  [ -e ./lxsh-${verrev_lxsh}.all.rock ] &&  cd ../.. && rm -rf ./lxsh-${verrev_lxsh}; }
-fail_make_which_rockspec() { rm -rf ./luasocket-${verrev_luasocket} && $luarocks download --source luasocket && $luarocks unpack ./luasocket-${verrev_luasocket}.src.rock && cd luasocket-${verrev_luasocket}/${srcdir_luasocket}  && $luarocks make && cd ../.. && rm -rf ./luasocket-${verrev_luasocket}; }
 
 test_new_version() { $luarocks download --rockspec luacov ${version_luacov} &&  $luarocks new_version ./luacov-${version_luacov}-1.rockspec 0.2 && rm ./luacov-0.*; }
 test_new_version_url() { $luarocks download --rockspec abelhas 1.0 && $luarocks new_version ./abelhas-1.0-1.rockspec 1.1 https://github.com/downloads/ittner/abelhas/abelhas-1.1.tar.gz && rm ./abelhas-*; }
+test_new_version_tag() { $luarocks download --rockspec luacov ${version_luacov} && $luarocks new_version ./luacov-${version_luacov}-1.rockspec --tag v0.3 && rm ./luacov-0.3-1.rockspec; }
 
 test_pack() { $luarocks list && $luarocks pack luacov && rm ./luacov-*.rock; }
 test_pack_src() { $luarocks install $luasec && $luarocks download --rockspec luasocket && $luarocks pack ./luasocket-${verrev_luasocket}.rockspec && rm ./luasocket-${version_luasocket}-*.rock; }
@@ -487,10 +496,18 @@ fail_remove_invalid_name() { $luarocks remove invalid.rock; }
 
 test_search_found() { $luarocks search zlib; }
 test_search_missing() { $luarocks search missing_rock; }
+test_search_version() { $luarocks search zlib 1.1; }
+test_search_all() { $luarocks search --all; }
+fail_search_nostring() { $var=123; $luarocks search $var; }
 
 test_show() { $luarocks show luacov; }
 test_show_modules() { $luarocks show --modules luacov; }
 test_show_home() { $luarocks show --home luacov; }
+test_show_deps() { $luarocks show --deps luacov; }
+test_show_rockspec() { $luarocks show --rockspec luacov; }
+test_show_mversion() { $luarocks show --mversion luacov; }
+test_show_rocktree() { $luarocks show --rock-tree luacov; }
+test_show_rockdir() { $luarocks show --rock-dir luacov; }
 test_show_depends() { need_luasocket; $luarocks install $luasec && $luarocks show luasec; }
 test_show_oldversion() { $luarocks install luacov ${version_luacov} && $luarocks show luacov ${version_luacov}; }
 
@@ -515,6 +532,7 @@ fail_admin_invalidrock() { $luarocks_admin --server=testing add invalid; }
 test_admin_refresh_cache() { $luarocks_admin --server=testing refresh_cache; }
 test_admin_remove() { $luarocks_admin --server=testing remove luasocket-${verrev_luasocket}.src.rock; }
 fail_admin_remove_missing() { $luarocks_admin --server=testing remove; }
+fail_admin_split_server_url() { $luarocks_admin --server="localhost@/tmp/luarocks_testing" add "$testing_server/luasocket-${verrev_luasocket}.src.rock"; }
 
 fail_deps_mode_invalid_arg() { $luarocks remove luacov --deps-mode; }
 test_deps_mode_one() { $luarocks build --tree="system" lpeg && $luarocks list && $luarocks build --deps-mode=one --tree="$testing_tree" lxsh && [ `$luarocks_noecho list --tree="$testing_tree" --porcelain lpeg | wc -l` = 1 ]; }
@@ -527,6 +545,7 @@ test_deps_mode_make_order() { $luarocks build --tree="$testing_sys_tree" lpeg &&
 test_deps_mode_make_order_sys() { $luarocks build --tree="$testing_tree" lpeg && rm -rf ./lxsh-${verrev_lxsh} && $luarocks download --source lxsh ${verrev_lxsh} && $luarocks unpack ./lxsh-${verrev_lxsh}.src.rock && cd lxsh-${verrev_lxsh}/lxsh-${version_lxsh}-1  && $luarocks make --tree="$testing_sys_tree" --deps-mode=order && cd ../.. && [ `$luarocks_noecho list --tree="$testing_tree" --porcelain lpeg | wc -l` = 1 ] && rm -rf ./lxsh-${verrev_lxsh}; }
 
 test_write_rockspec() { $luarocks write_rockspec git://github.com/keplerproject/luarocks; }
+test_write_rockspec_tag() { $luarocks write_rockspec git://github.com/keplerproject/luarocks --tag=v2.3.0; }
 test_write_rockspec_lib() { $luarocks write_rockspec git://github.com/mbalmer/luafcgi --lib=fcgi --license="3-clause BSD" --lua-version=5.1,5.2; }
 test_write_rockspec_format() { $luarocks write_rockspec git://github.com/keplerproject/luarocks --rockspec-format=1.1 --lua-version=5.1,5.2; }
 test_write_rockspec_fullargs() { $luarocks write_rockspec git://github.com/keplerproject/luarocks --lua-version=5.1,5.2 --license="MIT/X11" --homepage="http://www.luarocks.org" --summary="A package manager for Lua modules"; }
@@ -574,6 +593,8 @@ fail_luajit_dependency() {
 }
 
 test_doc() { $luarocks install luarepl; $luarocks doc luarepl; }
+test_doc_home() { $luarocks install luacov; $luarocks doc luacov --home; }
+fail_doc_invalid() { $luarocks doc invalid; }
 
 # Driver #########################################
 
@@ -639,16 +660,18 @@ run_all_tests() {
 run_all_tests $1
 #run_with_minimal_environment $1
 
+cd "$testing_dir/.."
+
 if [ "$travis" ]
 then
    if [ "$TRAVIS" ]
    then
       build_environment luacov luafilesystem luacov-coveralls
-      ( cd $testing_dir; $testing_sys_tree/bin/luacov-coveralls || echo "ok" )
+      $testing_sys_tree/bin/luacov-coveralls -c "$testing_dir/luacov.config" || echo "ok"
    fi
-   $testing_sys_tree/bin/luacov -c $testing_dir/luacov.config src/luarocks src/bin
-   grep "Summary" -B1 -A1000 $testing_dir/luacov.report.out
+   $testing_sys_tree/bin/luacov -c "$testing_dir/luacov.config"
+   grep "Summary" -B1 -A1000 "$testing_dir/luacov.report.out"
 else
-   $testing_sys_tree/bin/luacov -c $testing_dir/luacov.config src/luarocks src/bin
+   $testing_sys_tree/bin/luacov -c "$testing_dir/luacov.config"
    cat "$testing_dir/luacov.report.out"
 fi