4 files changed, 54 insertions, 19 deletions

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..dced928c
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,3 @@
+language: c
+compiler: gcc
+script: cd test && ./testing.sh --travis
diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua
index e98d9cc2..53c9d748 100644
--- a/src/luarocks/fetch.lua
+++ b/src/luarocks/fetch.lua
@@ -233,7 +233,7 @@ function load_rockspec(filename, location)
       name = "rockspec"
    else
       name = basename:match("(.*)%.rockspec")
-      if not name and not basename == "rockspec" then
+      if not name then
          return nil, "Filename '"..filename.."' does not look like a rockspec."
       end
    end
diff --git a/src/luarocks/type_check.lua b/src/luarocks/type_check.lua
index 6a0ee7e7..5436bde6 100644
--- a/src/luarocks/type_check.lua
+++ b/src/luarocks/type_check.lua
@@ -184,7 +184,7 @@ local function type_check_item(name, item, expected, context)
       end
       if expected ~= "string" then
          if not item:match("^"..expected.."$") then
-            return nil, "Type mismatch on field "..context..name..": invalid value "..item
+            return nil, "Type mismatch on field "..context..name..": invalid value "..item.." does not match '"..expected.."'"
          end
       end
    elseif expected_type == "table" then
diff --git a/test/testing.sh b/test/testing.sh
index 6b8be3ab..bce65294 100755
--- a/test/testing.sh
+++ b/test/testing.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 
 # Setup #########################################
 
@@ -7,7 +7,7 @@
    exit 1
 }
 
-if [ -z "$@" ]
+if [ -z "$*" ]
 then
    ps aux | grep -q '[s]shd' || {
       echo "Run sudo /bin/sshd in order to perform all tests."
@@ -15,6 +15,12 @@ then
    }
 fi
 
+if [ "$1" == "--travis" ]
+then
+   travis=true
+   shift
+fi
+
 testing_dir="$PWD"
 
 testing_tree="$testing_dir/testing"
@@ -97,17 +103,41 @@ export LUAROCKS_CONFIG="$testing_dir/testing_config.lua"
 export LUA_PATH=
 export LUA_CPATH=
 
-luadir="/Programs/Lua/Current"
-platform="linux-x86"
+luaversion=5.2.3
+if [ "$travis" ]
+then
+   pushd /tmp
+   if [ ! -e "lua/bin/lua" ]
+   then
+      mkdir -p lua
+      wget "http://www.lua.org/ftp/lua-$luaversion.tar.gz"
+      tar zxvpf "lua-$luaversion.tar.gz"
+      cd "lua-$luaversion"
+      make linux INSTALL_TOP=/tmp/lua
+      make install INSTALL_TOP=/tmp/lua
+   fi
+   popd
+   luadir=/tmp/lua
+   platform="linux-x86_64"
+else
+   luadir="/Programs/Lua/Current"
+   platform="linux-x86"
+fi
 lua="$luadir/bin/lua"
 
+version_luasocket=3.0rc1
+verrev_luasocket=${version_luasocket}-1
+srcdir_luasocket=luasocket-3.0-rc1
+
 version_luacov=0.3
-version_luasocket=2.0.2
 version_lxsh=0.8.6
 version_validate_args=1.5.4
-verrev_luasocket=${version_luasocket}-5
 verrev_lxsh=${version_lxsh}-2
 
+# will change to luasec=luasec once LuaSec for Lua 5.2 is released
+luasec="http://luarocks.org/repositories/rocks-scm/luasec-scm-1.rockspec"
+#luasec=luasec
+
 cd ..
 ./configure --with-lua="$luadir"
 make clean
@@ -181,10 +211,10 @@ test_build_diffversion() { $luarocks build luacov ${version_luacov}; }
 test_build_command() { $luarocks build stdlib; }
 test_build_install_bin() { $luarocks build luarepl; }
 fail_build_nohttps() { $luarocks install luasocket && $luarocks download --rockspec validate-args ${version_validate_args} && $luarocks build ./validate-args-${version_validate_args}-1.rockspec && rm ./validate-args-${version_validate_args}-1.rockspec; }
-test_build_https() { $luarocks download --rockspec validate-args ${version_validate_args} && $luarocks install luasec && $luarocks build ./validate-args-${version_validate_args}-1.rockspec && rm ./validate-args-${version_validate_args}-1.rockspec; }
-test_build_supported_platforms() { $luarocks build xctrl; }
+test_build_https() { $luarocks download --rockspec validate-args ${version_validate_args} && $luarocks install $luasec && $luarocks build ./validate-args-${version_validate_args}-1.rockspec && rm ./validate-args-${version_validate_args}-1.rockspec; }
+test_build_supported_platforms() { $luarocks build lpty; }
 
-test_build_deps_partial_match() { $luarocks build yaml; }
+test_build_deps_partial_match() { if [ "$travis" ]; then return; fi; $luarocks build yaml; }
 test_build_show_downloads() { export LUAROCKS_CONFIG="$testing_dir/testing_config_show_downloads.lua" && $luarocks build alien; export LUAROCKS_CONFIG="$testing_dir/testing_config.lua"; }
 
 test_download_all() { $luarocks download --all validate-args && rm validate-args-*; }
@@ -200,14 +230,16 @@ test_lint_ok() { $luarocks download --rockspec validate-args ${version_validate_
 test_list() { $luarocks list; }
 test_list_porcelain() { $luarocks list --porcelain; }
 
-test_make() { rm -rf ./luasocket-${verrev_luasocket} && $luarocks download --src luasocket && $luarocks unpack ./luasocket-${verrev_luasocket}.src.rock && cd luasocket-${verrev_luasocket}/luasocket-${version_luasocket}  && $luarocks make && cd ../.. && rm -rf ./luasocket-${verrev_luasocket}; }
+test_make_with_rockspec() { rm -rf ./luasocket-${verrev_luasocket} && $luarocks download --src 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 --src 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_pack_binary_rock() { rm -rf ./lxsh-${verrev_lxsh} &&  $luarocks download --src 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 --src 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_pack() { $luarocks list && $luarocks pack luacov && rm ./luacov-*.rock; }
-test_pack_src() { $luarocks download --rockspec luasocket && $luarocks pack ./luasocket-${verrev_luasocket}.rockspec && rm ./luasocket-${version_luasocket}-*.rock; }
+test_pack_src() { $luarocks install $luasec && $luarocks download --rockspec luasocket && $luarocks pack ./luasocket-${verrev_luasocket}.rockspec && rm ./luasocket-${version_luasocket}-*.rock; }
 
 test_path() { $luarocks path --bin; }
 
@@ -222,7 +254,7 @@ test_search_missing() { $luarocks search missing_rock; }
 
 test_show() { $luarocks show luacov; }
 test_show_modules() { $luarocks show --modules luacov; }
-test_show_depends() { $luarocks install luasec && $luarocks show luasec; }
+test_show_depends() { $luarocks install $luasec && $luarocks show luasec; }
 test_show_oldversion() { $luarocks install luacov ${version_luacov} && $luarocks show luacov ${version_luacov}; }
 
 test_unpack_download() { rm -rf ./luasocket-${verrev_luasocket} && $luarocks unpack luasocket && rm -rf ./luasocket-${verrev_luasocket}; }
@@ -233,13 +265,13 @@ test_unpack_binary() { rm -rf ./luasocket-${verrev_luasocket} && $luarocks build
 test_admin_help() { $luarocks_admin help; }
 
 test_admin_make_manifest() { $luarocks_admin make_manifest; }
-test_admin_add_rsync() { $luarocks_admin --server=testing add ./luasocket-${verrev_luasocket}.src.rock; }
-test_admin_add_sftp() { export LUAROCKS_CONFIG="$testing_dir/testing_config_sftp.lua" && $luarocks_admin --server=testing add ./luasocket-${verrev_luasocket}.src.rock; export LUAROCKS_CONFIG="$testing_dir/testing_config.lua"; }
+test_admin_add_rsync() { if [ "$travis" ]; then return; fi; $luarocks_admin --server=testing add ./luasocket-${verrev_luasocket}.src.rock; }
+test_admin_add_sftp() { if [ "$travis" ]; then return; fi; export LUAROCKS_CONFIG="$testing_dir/testing_config_sftp.lua" && $luarocks_admin --server=testing add ./luasocket-${verrev_luasocket}.src.rock; export LUAROCKS_CONFIG="$testing_dir/testing_config.lua"; }
 fail_admin_add_missing() { $luarocks_admin --server=testing add; }
 fail_admin_invalidserver() { $luarocks_admin --server=invalid add ./luasocket-${verrev_luasocket}.src.rock; }
-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_invalidrock() { if [ "$travis" ]; then return 1; fi; $luarocks_admin --server=testing add invalid; }
+test_admin_refresh_cache() { if [ "$travis" ]; then return; fi; $luarocks_admin --server=testing refresh_cache; }
+test_admin_remove() { if [ "$travis" ]; then return; fi; $luarocks_admin --server=testing remove ./luasocket-${verrev_luasocket}.src.rock; }
 fail_admin_remove_missing() { $luarocks_admin --server=testing remove; }
 
 fail_deps_mode_invalid_arg() { $luarocks remove luacov --deps-mode; }