Merge branch 'master' of https://github.com/keplerproject/luarocks

14 files changed, 99 insertions, 56 deletions

diff --git a/.gitignore b/.gitignore
index 13a07720..f74b9549 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /config.*
 /src/luarocks/site_config.lua
+/test/testing_*
+/test/luacov.*
diff --git a/Makefile b/Makefile
index 1f9d0e2d..5f983534 100644
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,16 @@
 
 include config.unix
+include Makefile.setup.inc
+include Makefile.install.inc
 
 .PHONY: all build dev build_bins luadoc check_makefile cleanup_bins clean \
- install_bins install_luas install_site_config write_sysconfig \
- install bootstrap install_rock
+ install_site_config write_sysconfig install bootstrap install_rock
 
-DESTDIR =
-PREFIX ?= /usr/local
 ROCKS_TREE ?= $(PREFIX)
 SYSCONFDIR ?= $(PREFIX)/etc/luarocks
-BINDIR ?= $(PREFIX)/bin
-LUADIR ?= $(PREFIX)/share/lua/$(LUA_VERSION)/
 LUA_DIR ?= /usr/local
 LUA_BINDIR ?= $(LUA_DIR)/bin
 
-BIN_FILES = luarocks luarocks-admin
-LUAROCKS_FILES = fs/unix/tools.lua fs/unix.lua fs/win32/tools.lua fs/win32.lua \
-fs/lua.lua persist.lua list.lua require.lua repos.lua dir.lua make_manifest.lua \
-command_line.lua install.lua build/command.lua build/cmake.lua build/make.lua \
-build/builtin.lua fetch/cvs.lua fetch/git.lua fetch/sscm.lua tools/patch.lua \
-fetch/svn.lua tools/zip.lua tools/tar.lua pack.lua type_check.lua make.lua \
-remove.lua fs.lua manif.lua add.lua deps.lua build.lua search.lua show.lua \
-manif_core.lua fetch.lua unpack.lua validate.lua cfg.lua download.lua \
-help.lua util.lua index.lua cache.lua refresh_cache.lua loader.lua \
-admin_remove.lua fetch/hg.lua fetch/git_file.lua new_version.lua lint.lua \
-purge.lua path.lua path_cmd.lua write_rockspec.lua doc.lua upload.lua \
-upload/api.lua upload/multipart.lua fetch/git_http.lua
-
 CONFIG_FILE = $(SYSCONFDIR)/config-$(LUA_VERSION).lua
 
 SAFEPWD=`echo "$$PWD" | sed -e 's/\([][]\)\1/]]..'\''\1\1'\''..[[/g'`
@@ -139,23 +123,6 @@ cleanup_bins:
 clean: cleanup_bins
         rm -f src/luarocks/site_config.lua
 
-install_bins:
-        mkdir -p "$(DESTDIR)$(BINDIR)"
-        cd src/bin && for f in $(BIN_FILES); \
-        do \
-           cp "$$f" "$(DESTDIR)$(BINDIR)/$$f-$(LUA_VERSION)"; \
-           ln -nfs "$$f-$(LUA_VERSION)" "$(DESTDIR)$(BINDIR)/$$f"; \
-        done
-
-install_luas:
-        mkdir -p "$(DESTDIR)$(LUADIR)/luarocks"
-        cd src/luarocks && for f in $(LUAROCKS_FILES); \
-        do \
-           d="$(DESTDIR)$(LUADIR)/luarocks"/`dirname "$$f"` && \
-           mkdir -p "$$d" && \
-           cp "$$f" "$$d" || exit 1; \
-        done
-
 install_site_config: src/luarocks/site_config.lua
         mkdir -p "$(DESTDIR)$(LUADIR)/luarocks"
         cp src/luarocks/site_config.lua "$(DESTDIR)$(LUADIR)/luarocks"
@@ -180,3 +147,4 @@ bootstrap: src/luarocks/site_config.lua install_site_config write_sysconfig clea
         '$(LUA_BINDIR)/lua$(LUA_SUFFIX)' -e "package.path=[[$(SAFEPWD)/src/?.lua;]]..package.path" src/bin/luarocks make rockspec --tree="$(PREFIX)"
 
 install_rock: install_bins install_luas
+
diff --git a/Makefile.install.inc b/Makefile.install.inc
new file mode 100644
index 00000000..20d96a12
--- /dev/null
+++ b/Makefile.install.inc
@@ -0,0 +1,22 @@
+
+.PHONY: install_bins install_luas 
+
+install_bins:
+        mkdir -p "$(DESTDIR)$(BINDIR)"
+        cd src/bin && \
+        luaver="$(LUA_VERSION)" && [ -n "$$luaver" ] || luaver=`$(LUA) -e 'print(_VERSION:sub(5))'`; \
+        for f in $(BIN_FILES); \
+        do \
+           cp "$$f" "$(DESTDIR)$(BINDIR)/$$f-$$luaver"; \
+           ln -nfs "$$f-$$luaver" "$(DESTDIR)$(BINDIR)/$$f"; \
+        done
+
+install_luas:
+        mkdir -p "$(DESTDIR)$(LUADIR)/luarocks"
+        cd src/luarocks && for f in $(LUAROCKS_FILES); \
+        do \
+           d="$(DESTDIR)$(LUADIR)/luarocks"/`dirname "$$f"` && \
+           mkdir -p "$$d" && \
+           cp "$$f" "$$d" || exit 1; \
+        done
+
diff --git a/Makefile.luarocks b/Makefile.luarocks
new file mode 100644
index 00000000..1eecfeae
--- /dev/null
+++ b/Makefile.luarocks
@@ -0,0 +1,15 @@
+
+include Makefile.setup.inc
+include Makefile.install.inc
+
+.PHONY: all install copy_site_config
+
+all:
+        @echo This Makefile is used by the LuaRocks rockspec for upgrading itself.
+
+install: install_bins install_luas copy_site_config
+
+copy_site_config:
+        luaver="$(LUA_VERSION)" && [ -n "$$luaver" ] || luaver=`$(LUA) -e 'print(_VERSION:sub(5))'`; \
+        mkdir -p "$(DESTDIR)$(LUADIR)/luarocks"; \
+        cp $(LUAROCKS_PREFIX)/share/lua/$$luaver/luarocks/site_config.lua "$(DESTDIR)$(LUADIR)/luarocks"
diff --git a/Makefile.setup.inc b/Makefile.setup.inc
new file mode 100644
index 00000000..eb51ba5e
--- /dev/null
+++ b/Makefile.setup.inc
@@ -0,0 +1,19 @@
+
+DESTDIR =
+PREFIX ?= /usr/local
+BINDIR ?= $(PREFIX)/bin
+LUADIR ?= $(PREFIX)/share/lua/$(LUA_VERSION)/
+
+BIN_FILES = luarocks luarocks-admin
+LUAROCKS_FILES = fs/unix/tools.lua fs/unix.lua fs/win32/tools.lua fs/win32.lua \
+fs/lua.lua persist.lua list.lua require.lua repos.lua dir.lua make_manifest.lua \
+command_line.lua install.lua build/command.lua build/cmake.lua build/make.lua \
+build/builtin.lua fetch/cvs.lua fetch/git.lua fetch/sscm.lua tools/patch.lua \
+fetch/svn.lua tools/zip.lua tools/tar.lua pack.lua type_check.lua make.lua \
+remove.lua fs.lua manif.lua add.lua deps.lua build.lua search.lua show.lua \
+manif_core.lua fetch.lua unpack.lua validate.lua cfg.lua download.lua \
+help.lua util.lua index.lua cache.lua refresh_cache.lua loader.lua \
+admin_remove.lua fetch/hg.lua fetch/git_file.lua new_version.lua lint.lua \
+purge.lua path.lua path_cmd.lua write_rockspec.lua doc.lua upload.lua \
+upload/api.lua upload/multipart.lua fetch/git_http.lua
+
diff --git a/README.md b/README.md
index d6494a5c..5fd44d22 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
-LuaRocks
-========
+<p align="center"><a href="http://luarocks.org"><img border="0" src="http://keplerproject.github.io/luarocks/luarocks.png" alt="LuaRocks" width="500px"></a></p>
 
 A package manager for Lua modules.
 
diff --git a/configure b/configure
index e67337ab..e84f00bf 100755
--- a/configure
+++ b/configure
@@ -292,7 +292,7 @@ then
    else
       suffixes="5.3 53 -5.3 -53 5.2 52 -5.2 -52 5.1 51 -5.1 -51"
    fi
-   for suffix in `echo $suffixes` ""
+   for suffix in "" `echo $suffixes`
    do
       search_interpreter "$suffix" && break
    done
diff --git a/makedist b/makedist
index 141f6700..482c77f7 100755
--- a/makedist
+++ b/makedist
@@ -39,8 +39,8 @@ do
       cp "$i" "$out/$dir"
       if echo "$i" | grep -v "/bin/" | grep -q "^src/"
       then
-         grep -qw `basename "$i"` Makefile || { 
-            echo "Missing ref in makefile: $i"
+         grep -qw `basename "$i"` Makefile.setup.inc || {
+            echo "Missing ref in Makefile.setup.inc: $i"
             touch "missing_ref"
             exit 1
          }
@@ -68,7 +68,7 @@ cd ..
 rm -rf "release-unix"
 
 cd "release-windows/$out-win32"
-rm -rf makedist Makefile configure lfw .travis.yml .gitignore
+rm -rf makedist Makefile* configure lfw .travis.yml .gitignore test
 cd ..
 zip -r ../"$out-win32.zip" "$out-win32"
 cd ..
diff --git a/rockspec b/rockspec
index 69a85319..5b0ffc9c 100644
--- a/rockspec
+++ b/rockspec
@@ -1,7 +1,9 @@
 package = "LuaRocks"
-local VER = "2.2.0"
-local REV = "1"
-version = VER.."-"..REV
+local VER = "scm-1"
+
+source = {
+   url = "--this rockspec is used by `make bootstrap` only--",
+}
 
 description = {
    summary = "A deployment and management system for Lua modules.",
@@ -23,16 +25,13 @@ dependencies = {
    "lua >= 5.1"
 }
 
-source = {
-   url = "http://luarocks.org/releases/luarocks-"..VER..".tar.gz",
-}
-
 build = {
    type = "make",
    install_target = "install_rock",
    build_pass=false,
    install_variables = {
       BINDIR="$(BINDIR)",
-      LUADIR="$(LUADIR)"
+      LUADIR="$(LUADIR)",
+      LUA="$(LUA)",
    }
 }
diff --git a/src/luarocks/upload/api.lua b/src/luarocks/upload/api.lua
index fd476968..6dfb98df 100644
--- a/src/luarocks/upload/api.lua
+++ b/src/luarocks/upload/api.lua
@@ -119,6 +119,11 @@ end
 local ltn12_ok, ltn12 = pcall(require, "ltn12")
 if not ltn12_ok then -- If not using LuaSocket and/or LuaSec...
 
+local function redact_api_url(url)
+   url = tostring(url)
+   return (url:gsub(".*/api/[^/]+/[^/]+", "")) or ""
+end
+
 function Api:request(url, params, post_params)
    local vars = cfg.variables
    local json_ok, json = require_json()
@@ -157,26 +162,26 @@ function Api:request(url, params, post_params)
       end
       local ok = fs.execute_string(curl_cmd..fs.Q(url).." -o "..fs.Q(tmpfile))
       if not ok then
-         return nil, "API failure: " .. tostring(url)
+         return nil, "API failure: " .. redact_api_url(url)
       end
    else
       local ok, err = fs.download(url, tmpfile)
       if not ok then
-         return nil, "API failure: " .. tostring(err) .. " - " .. tostring(url)
+         return nil, "API failure: " .. tostring(err) .. " - " .. redact_api_url(url)
       end
    end
 
    local tmpfd = io.open(tmpfile)
    if not tmpfd then
       os.remove(tmpfile)
-      return nil, "API failure reading temporary file - " .. tostring(url)
+      return nil, "API failure reading temporary file - " .. redact_api_url(url)
    end
    out = tmpfd:read("*a")
    tmpfd:close()
    os.remove(tmpfile)
 
    if self.debug then
-      util.printout("[" .. tostring(method) .. " via curl] " .. tostring(url) .. " ... ")
+      util.printout("[" .. tostring(method) .. " via curl] " .. redact_api_url(url) .. " ... ")
    end
 
    return json.decode(out)
@@ -229,7 +234,7 @@ function Api:request(url, params, post_params)
    end
    local method = post_params and "POST" or "GET"
    if self.debug then
-      util.printout("[" .. tostring(method) .. " via "..via.."] " .. tostring(url) .. " ... ")
+      util.printout("[" .. tostring(method) .. " via "..via.."] " .. redact_api_url(url) .. " ... ")
    end
    local out = {}
    local _, status = http.request({
@@ -243,7 +248,7 @@ function Api:request(url, params, post_params)
       util.printout(tostring(status))
    end
    if status ~= 200 then
-      return nil, "API returned " .. tostring(status) .. " - " .. tostring(url)
+      return nil, "API returned " .. tostring(status) .. " - " .. redact_api_url(url)
    end
    return json.decode(table.concat(out))
 end
diff --git a/test/testfiles/not_a_zipfile-1.0-1.src.rock b/test/testfiles/not_a_zipfile-1.0-1.src.rock
new file mode 100644
index 00000000..e36f8bbe
--- /dev/null
+++ b/test/testfiles/not_a_zipfile-1.0-1.src.rock
@@ -0,0 +1 @@
+I am not a .zip file!
diff --git a/test/testfiles/type_mismatch_string-1.0-1.rockspec b/test/testfiles/type_mismatch_string-1.0-1.rockspec
new file mode 100644
index 00000000..7a607cfd
--- /dev/null
+++ b/test/testfiles/type_mismatch_string-1.0-1.rockspec
@@ -0,0 +1,4 @@
+
+package="type_mismatch_version"
+version=1.0
+
diff --git a/test/testfiles/type_mismatch_table-1.0-1.rockspec b/test/testfiles/type_mismatch_table-1.0-1.rockspec
new file mode 100644
index 00000000..f348b798
--- /dev/null
+++ b/test/testfiles/type_mismatch_table-1.0-1.rockspec
@@ -0,0 +1,5 @@
+
+package="type_mismatch_table"
+version="1.0-1"
+
+source = "not a table"
diff --git a/test/testfiles/type_mismatch_version-1.0-1.rockspec b/test/testfiles/type_mismatch_version-1.0-1.rockspec
new file mode 100644
index 00000000..5e30dae6
--- /dev/null
+++ b/test/testfiles/type_mismatch_version-1.0-1.rockspec
@@ -0,0 +1,4 @@
+
+package="type_mismatch_version"
+version="1.0"
+