5 files changed, 101 insertions, 84 deletions

diff --git a/Makefile b/Makefile
index 5231cec4..c10a1cb0 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ include config.unix
 
 DESTDIR =
 PREFIX ?= /usr/local
+SYSCONFDIR ?= $(PREFIX)/etc/luarocks
 BINDIR ?= $(PREFIX)/bin
 LUADIR ?= $(PREFIX)/share/lua/5.1/
 LUA_DIR ?= /usr/local
@@ -19,62 +20,61 @@ remove.lua fs.lua manif.lua add.lua deps.lua build.lua search.lua \
 manif_core.lua fetch.lua unpack.lua validate.lua cfg.lua download.lua \
 help.lua util.lua index.lua cache.lua add.lua refresh_cache.lua loader.lua
 
-
 CONFIG_FILE = $(SYSCONFDIR)/config.lua
 
 all: built
 
-built:
-        for f in $(BIN_FILES) ;\
-        do \
-           sed "1d" src/bin/$$f >> src/bin/$$f.bak ;\
-           echo "#!$(LUA_BINDIR)/lua$(LUA_SUFFIX)" > src/bin/$$f ;\
-           echo "package.path = [[$(LUADIR)/?.lua;$(LUADIR)/?/init.lua;]]..package.path" >> src/bin/$$f ;\
-           cat src/bin/$$f.bak >> src/bin/$$f ;\
-           rm src/bin/$$f.bak ;\
-        done
-        sed -i.bak "/^local LUA/d" src/luarocks/cfg.lua
-        rm src/luarocks/cfg.lua.bak
-        cp src/luarocks/cfg.lua src/luarocks/cfg.lua.bak
-        rm src/luarocks/cfg.lua
+src/luarocks/config.lua: config.unix
+        rm -f src/luarocks/config.lua
+        echo 'module("luarocks.config")' >> src/luarocks/config.lua
         if [ -n "$(PREFIX)" ] ;\
         then \
-           echo "local LUAROCKS_PREFIX=[[$(PREFIX)]]" >> src/luarocks/cfg.lua ;\
+           echo "LUAROCKS_PREFIX=[[$(PREFIX)]]" >> src/luarocks/config.lua ;\
         fi
         if [ -n "$(LUA_INCDIR)" ] ;\
         then \
-           echo "local LUA_INCDIR=[[$(LUA_INCDIR)]]" >> src/luarocks/cfg.lua ;\
+           echo "LUA_INCDIR=[[$(LUA_INCDIR)]]" >> src/luarocks/config.lua ;\
         fi
         if [ -n "$(LUA_LIBDIR)" ] ;\
         then \
-           echo "local LUA_LIBDIR=[[$(LUA_LIBDIR)]]" >> src/luarocks/cfg.lua ;\
+           echo "LUA_LIBDIR=[[$(LUA_LIBDIR)]]" >> src/luarocks/config.lua ;\
         fi
         if [ -n "$(LUA_BINDIR)" ] ;\
         then \
-           echo "local LUA_BINDIR=[[$(LUA_BINDIR)]]" >> src/luarocks/cfg.lua ;\
+           echo "LUA_BINDIR=[[$(LUA_BINDIR)]]" >> src/luarocks/config.lua ;\
         fi
         if [ -n "$(LUA_SUFFIX)" ] ;\
         then \
-           echo "local LUA_INTERPRETER=[[lua$(LUA_SUFFIX)]]" >> src/luarocks/cfg.lua ;\
+           echo "LUA_INTERPRETER=[[lua$(LUA_SUFFIX)]]" >> src/luarocks/config.lua ;\
         fi
         if [ -n "$(SYSCONFDIR)" ] ;\
         then \
-           echo "local LUAROCKS_SYSCONFIG=[[$(SYSCONFDIR)/config.lua]]" >> src/luarocks/cfg.lua ;\
+           echo "LUAROCKS_SYSCONFIG=[[$(SYSCONFDIR)/config.lua]]" >> src/luarocks/config.lua ;\
         fi
         if [ -n "$(ROCKS_TREE)" ] ;\
         then \
-           echo "local LUAROCKS_ROCKS_TREE=[[$(ROCKS_TREE)]]" >> src/luarocks/cfg.lua ;\
+           echo "LUAROCKS_ROCKS_TREE=[[$(ROCKS_TREE)]]" >> src/luarocks/config.lua ;\
         fi
         if [ -n "$(FORCE_CONFIG)" ] ;\
         then \
-           echo "local LUAROCKS_FORCE_CONFIG=true" >> src/luarocks/cfg.lua ;\
+           echo "LUAROCKS_FORCE_CONFIG=true" >> src/luarocks/config.lua ;\
         fi
-        echo "local LUAROCKS_UNAME_S=[[$(LUAROCKS_UNAME_S)]]" >> src/luarocks/cfg.lua
-        echo "local LUAROCKS_UNAME_M=[[$(LUAROCKS_UNAME_M)]]" >> src/luarocks/cfg.lua
-        echo "local LUAROCKS_DOWNLOADER=[[$(LUAROCKS_DOWNLOADER)]]" >> src/luarocks/cfg.lua
-        echo "local LUAROCKS_MD5CHECKER=[[$(LUAROCKS_MD5CHECKER)]]" >> src/luarocks/cfg.lua
-        cat src/luarocks/cfg.lua.bak >> src/luarocks/cfg.lua
-        rm src/luarocks/cfg.lua.bak
+        echo "LUAROCKS_UNAME_S=[[$(LUAROCKS_UNAME_S)]]" >> src/luarocks/config.lua
+        echo "LUAROCKS_UNAME_M=[[$(LUAROCKS_UNAME_M)]]" >> src/luarocks/config.lua
+        echo "LUAROCKS_DOWNLOADER=[[$(LUAROCKS_DOWNLOADER)]]" >> src/luarocks/config.lua
+        echo "LUAROCKS_MD5CHECKER=[[$(LUAROCKS_MD5CHECKER)]]" >> src/luarocks/config.lua
+
+build_bins:
+        for f in $(BIN_FILES) ;\
+        do \
+           sed "1d" src/bin/$$f >> src/bin/$$f.bak ;\
+           echo "#!$(LUA_BINDIR)/lua$(LUA_SUFFIX)" > src/bin/$$f ;\
+           echo "package.path = [[$(LUADIR)/?.lua;$(LUADIR)/?/init.lua;]]..package.path" >> src/bin/$$f ;\
+           cat src/bin/$$f.bak >> src/bin/$$f ;\
+           rm src/bin/$$f.bak ;\
+        done
+
+built: src/luarocks/config.lua build_bins
         touch built
         @echo
         @echo "Done. Type 'make install' to install into $(PREFIX)."
@@ -102,14 +102,22 @@ clean:
            sed -i.bak "s,^#!.*lua.*,#!/usr/bin/env lua,;/^package.path/d" src/bin/$$f ;\
            rm src/bin/$$f.bak ;\
         done
-        sed -i.bak "/^local LUA/d" src/luarocks/cfg.lua
-        rm src/luarocks/cfg.lua.bak
+        rm -f src/luarocks/config.lua
+        rm -f built
 
-install: built
+install_bins:
         mkdir -p "$(DESTDIR)$(BINDIR)"
         cd src/bin && cp $(BIN_FILES) "$(DESTDIR)$(BINDIR)"
+
+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"; done
+
+install_config:
+        mkdir -p "$(DESTDIR)$(LUADIR)/luarocks"
+        cd src/luarocks && cp config.lua "$(DESTDIR)$(LUADIR)/luarocks"
+
+write_sysconfig:
         mkdir -p "$(DESTDIR)$(ROCKS_TREE)"
         if [ ! -f "$(DESTDIR)$(CONFIG_FILE)" ] ;\
         then \
@@ -124,17 +132,13 @@ install: built
            fi ;\
            echo '   [[$(ROCKS_TREE)]]' >> "$(DESTDIR)$(CONFIG_FILE)" ;\
            echo '}' >> "$(DESTDIR)$(CONFIG_FILE)" ;\
-           if [ -n "$(SCRIPTS_DIR)" ] ;\
-           then \
-              echo "scripts_dir = [[$(SCRIPTS_DIR)]]" >> "$(DESTDIR)$(CONFIG_FILE)" ;\
-           fi ;\
-           if [ -n "$(LUA_MODULES_DIR)" ] ;\
-           then \
-              echo "lua_modules_dir = [[$(LUA_MODULES_DIR)]]" >> "$(DESTDIR)$(CONFIG_FILE)" ;\
-           fi ;\
-           if [ -n "$(BIN_MODULES_DIR)" ] ;\
-           then \
-              echo "bin_modules_dir = [[$(BIN_MODULES_DIR)]]" >> "$(DESTDIR)$(CONFIG_FILE)" ;\
-           fi ;\
         fi
 
+install: built install_bins install_luas install_config write_sysconfig
+
+bootstrap: src/luarocks/config.lua install_config write_sysconfig
+        LUA_PATH="$$PWD/src/?.lua;$$LUA_PATH" src/bin/luarocks make rockspec
+
+#build_rock: build_bins
+
+install_rock: install_bins install_luas
diff --git a/install.bat b/install.bat
index 6ebd6680..94febc28 100644
--- a/install.bat
+++ b/install.bat
@@ -256,20 +256,20 @@ IF ERRORLEVEL 1 GOTO ERROR
 XCOPY /S src\luarocks\*.* "%LUADIR%\luarocks" >NUL

 IF ERRORLEVEL 1 GOTO ERROR

 

-RENAME "%LUADIR%\luarocks\cfg.lua" "cfg.lua.bak"

-ECHO local LUA_INCDIR=[[%LUA_INCDIR%]]>> "%LUADIR%\luarocks\cfg.lua" 

-ECHO local LUA_LIBDIR=[[%LUA_LIBDIR%]]>> "%LUADIR%\luarocks\cfg.lua" 

-ECHO local LUA_BINDIR=[[%LUA_BINDIR%]]>> "%LUADIR%\luarocks\cfg.lua" 

-ECHO local LUA_INTERPRETER=[[%LUA_INTERPRETER%]]>> "%LUADIR%\luarocks\cfg.lua" 

-ECHO local LUAROCKS_UNAME_S=[[WindowsNT]]>> "%LUADIR%\luarocks\cfg.lua" 

-ECHO local LUAROCKS_UNAME_M=[[x86]]>> "%LUADIR%\luarocks\cfg.lua" 

-ECHO local LUAROCKS_SYSCONFIG=[[%SYSCONFDIR%/config.lua]]>> "%LUADIR%\luarocks\cfg.lua" 

-ECHO local LUAROCKS_ROCKS_TREE=[[%ROCKS_TREE%]]>> "%LUADIR%\luarocks\cfg.lua" 

-ECHO local LUAROCKS_PREFIX=[[%PREFIX%]]>> "%LUADIR%\luarocks\cfg.lua" 

-IF NOT [%FORCE_CONFIG%]==[] ECHO local LUAROCKS_FORCE_CONFIG=true>> "%LUADIR%\luarocks\cfg.lua"

-TYPE "%LUADIR%\luarocks\cfg.lua.bak">> "%LUADIR%\luarocks\cfg.lua" 

+RENAME "%LUADIR%\luarocks\config.lua" "config.lua.bak"

+ECHO local LUA_INCDIR=[[%LUA_INCDIR%]]>> "%LUADIR%\luarocks\config.lua" 

+ECHO local LUA_LIBDIR=[[%LUA_LIBDIR%]]>> "%LUADIR%\luarocks\config.lua" 

+ECHO local LUA_BINDIR=[[%LUA_BINDIR%]]>> "%LUADIR%\luarocks\config.lua" 

+ECHO local LUA_INTERPRETER=[[%LUA_INTERPRETER%]]>> "%LUADIR%\luarocks\config.lua" 

+ECHO local LUAROCKS_UNAME_S=[[WindowsNT]]>> "%LUADIR%\luarocks\config.lua" 

+ECHO local LUAROCKS_UNAME_M=[[x86]]>> "%LUADIR%\luarocks\config.lua" 

+ECHO local LUAROCKS_SYSCONFIG=[[%SYSCONFDIR%/config.lua]]>> "%LUADIR%\luarocks\config.lua" 

+ECHO local LUAROCKS_ROCKS_TREE=[[%ROCKS_TREE%]]>> "%LUADIR%\luarocks\config.lua" 

+ECHO local LUAROCKS_PREFIX=[[%PREFIX%]]>> "%LUADIR%\luarocks\config.lua" 

+IF NOT [%FORCE_CONFIG%]==[] ECHO local LUAROCKS_FORCE_CONFIG=true>> "%LUADIR%\luarocks\config.lua"

+TYPE "%LUADIR%\luarocks\config.lua.bak">> "%LUADIR%\luarocks\config.lua" 

 

-DEL /F /Q "%LUADIR%\luarocks\cfg.lua.bak" 

+DEL /F /Q "%LUADIR%\luarocks\config.lua.bak" 

 

 SET CONFIG_FILE=%SYSCONFDIR%\config.lua

 

diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 2758ce0f..881db683 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -9,7 +9,10 @@ local rawset, next, table, pairs, print, require, io, os, setmetatable, pcall, i
 -- file format documentation</a> for details.
 module("luarocks.cfg")
 
-program_version = "2.0"
+-- Load site-local global configurations
+local config = require("luarocks.config")
+
+program_version = "2.0.1"
 user_agent = "LuaRocks/"..program_version
 
 local persist = require("luarocks.persist")
@@ -31,12 +34,12 @@ local detected = {}
 local system,proc
 
 -- A proper installation of LuaRocks will hardcode the system
--- and proc values with LUAROCKS_UNAME_S and LUAROCKS_UNAME_M,
+-- and proc values with config.LUAROCKS_UNAME_S and config.LUAROCKS_UNAME_M,
 -- so that this detection does not run every time. When it is
 -- performed, we use the Unix way to identify the system,
 -- even on Windows (assuming UnxUtils or Cygwin).
-system = LUAROCKS_UNAME_S or io.popen("uname -s"):read("*l")
-proc = LUAROCKS_UNAME_M or io.popen("uname -m"):read("*l")
+system = config.LUAROCKS_UNAME_S or io.popen("uname -s"):read("*l")
+proc = config.LUAROCKS_UNAME_M or io.popen("uname -m"):read("*l")
 if proc:match("i[%d]86") then
    proc = "x86"
 elseif proc:match("amd64") or proc:match("x86_64") then
@@ -82,9 +85,9 @@ end
 variables = {}
 rocks_trees = {}
 
-persist.load_into_table(LUAROCKS_SYSCONFIG or sys_config_file, _M)
+persist.load_into_table(config.LUAROCKS_SYSCONFIG or sys_config_file, _M)
 
-if not LUAROCKS_FORCE_CONFIG then
+if not config.LUAROCKS_FORCE_CONFIG then
    home_config_file = os.getenv("LUAROCKS_CONFIG") or home_config_file
    local home_overrides = persist.load_into_table(home_config_file, { home = home })
    if home_overrides then
@@ -97,14 +100,14 @@ if not next(rocks_trees) then
    if home_tree then
       table.insert(rocks_trees, home_tree)
    end
-   if LUAROCKS_ROCKS_TREE then
-      table.insert(rocks_trees, LUAROCKS_ROCKS_TREE)
+   if config.LUAROCKS_ROCKS_TREE then
+      table.insert(rocks_trees, config.LUAROCKS_ROCKS_TREE)
    end
 end
 
 -- Configure defaults:
 
-local root = LUAROCKS_ROCKS_TREE or home_tree
+local root = config.LUAROCKS_ROCKS_TREE or home_tree
 local defaults = {
    root_dir = root,
    rocks_dir = root.."/lib/luarocks/rocks",
@@ -123,9 +126,9 @@ local defaults = {
    },
 
    lua_extension = "lua",
-   lua_interpreter = LUA_INTERPRETER or "lua",
-   downloader = LUAROCKS_DOWNLOADER or "wget",
-   md5checker = LUAROCKS_MD5CHECKER or "md5sum",
+   lua_interpreter = config.LUA_INTERPRETER or "lua",
+   downloader = config.LUAROCKS_DOWNLOADER or "wget",
+   md5checker = config.LUAROCKS_MD5CHECKER or "md5sum",
 
    variables = {},
    
@@ -149,9 +152,9 @@ if detected.windows then
    defaults.external_lib_extension = "dll"
    defaults.obj_extension = "obj"
    defaults.external_deps_dirs = { "c:/external/" }
-   defaults.variables.LUA_BINDIR = LUA_BINDIR and LUA_BINDIR:gsub("\\", "/") or "c:/lua5.1/bin"
-   defaults.variables.LUA_INCDIR = LUA_INCDIR and LUA_INCDIR:gsub("\\", "/") or "c:/lua5.1/include"
-   defaults.variables.LUA_LIBDIR = LUA_LIBDIR and LUA_LIBDIR:gsub("\\", "/") or "c:/lua5.1/lib"
+   defaults.variables.LUA_BINDIR = config.LUA_BINDIR and config.LUA_BINDIR:gsub("\\", "/") or "c:/lua5.1/bin"
+   defaults.variables.LUA_INCDIR = config.LUA_INCDIR and config.LUA_INCDIR:gsub("\\", "/") or "c:/lua5.1/include"
+   defaults.variables.LUA_LIBDIR = config.LUA_LIBDIR and config.LUA_LIBDIR:gsub("\\", "/") or "c:/lua5.1/lib"
    defaults.cmake_generator = "MinGW Makefiles"
    defaults.make = "nmake" -- TODO: Split Windows flavors between mingw and msvc
    defaults.makefile = "Makefile.win"
@@ -178,9 +181,9 @@ if detected.unix then
    defaults.external_lib_extension = "so"
    defaults.obj_extension = "o"
    defaults.external_deps_dirs = { "/usr/local", "/usr" }
-   defaults.variables.LUA_BINDIR = LUA_BINDIR or "/usr/local/bin"
-   defaults.variables.LUA_INCDIR = LUA_INCDIR or "/usr/local/include"
-   defaults.variables.LUA_LIBDIR = LUA_LIBDIR or "/usr/local/lib"
+   defaults.variables.LUA_BINDIR = config.LUA_BINDIR or "/usr/local/bin"
+   defaults.variables.LUA_INCDIR = config.LUA_INCDIR or "/usr/local/include"
+   defaults.variables.LUA_LIBDIR = config.LUA_LIBDIR or "/usr/local/lib"
    defaults.variables.CFLAGS = "-O2"
    defaults.cmake_generator = "Unix Makefiles"
    defaults.make = "make"
@@ -245,7 +248,7 @@ end
 defaults.variables.LUA = defaults.lua_interpreter
 defaults.variables.LIB_EXTENSION = defaults.lib_extension
 defaults.variables.OBJ_EXTENSION = defaults.obj_extension
-defaults.variables.LUAROCKS_PREFIX = LUAROCKS_PREFIX
+defaults.variables.LUAROCKS_PREFIX = config.LUAROCKS_PREFIX
 
 -- Use defaults:
 
diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua
index 5e1f870d..073b14d1 100644
--- a/src/luarocks/fetch.lua
+++ b/src/luarocks/fetch.lua
@@ -146,9 +146,13 @@ function load_local_rockspec(filename)
    util.platform_overrides(rockspec.hooks)
 
    local basename = dir.base_name(filename)
-   rockspec.name = basename:match("(.*)-[^-]*-[0-9]*")
-   if not rockspec.name then
-      return nil, "Expected filename in format 'name-version-revision.rockspec'."
+   if basename == "rockspec" then
+      rockspec.name = rockspec.package:lower()
+   else
+      rockspec.name = basename:match("(.*)-[^-]*-[0-9]*")
+      if not rockspec.name then
+         return nil, "Expected filename in format 'name-version-revision.rockspec'."
+      end
    end
 
    local protocol, pathname = dir.split_url(rockspec.source.url)
@@ -164,7 +168,7 @@ function load_local_rockspec(filename)
    end
 
    local name_version = rockspec.package:lower() .. "-" .. rockspec.version
-   if basename ~= name_version .. ".rockspec" then
+   if basename ~= "rockspec" and basename ~= name_version .. ".rockspec" then
       return nil, "Inconsistency between rockspec filename ("..basename..") and its contents ("..name_version..".rockspec)."
    end
 
@@ -207,9 +211,15 @@ end
 function load_rockspec(filename, location)
    assert(type(filename) == "string")
 
-   local name = dir.base_name(filename):match("(.*)%.rockspec")
-   if not name then
-      return nil, "Filename '"..filename.."' does not look like a rockspec."
+   local name
+   local basename = dir.base_name(filename)
+   if basename == "rockspec" then
+      name = "rockspec"
+   else
+      name = basename:match("(.*)%.rockspec")
+      if not name and not basename == "rockspec" then
+         return nil, "Filename '"..filename.."' does not look like a rockspec."
+      end
    end
    
    local err, errcode
diff --git a/src/luarocks/make.lua b/src/luarocks/make.lua
index 1365cf13..cb2ba374 100644
--- a/src/luarocks/make.lua
+++ b/src/luarocks/make.lua
@@ -34,7 +34,7 @@ function run(...)
    if not rockspec then
       local files = fs.list_dir(fs.current_dir())
       for _, file in pairs(files) do
-         if file:match(".rockspec$") then
+         if file:match("rockspec$") then
             if rockspec then
                return nil, "Please specify which rockspec file to use."
             else
@@ -46,7 +46,7 @@ function run(...)
          return nil, "Argument missing: please specify a rockspec to use on current directory."
       end
    end
-   if not rockspec:match("%.rockspec$") then
+   if not rockspec:match("rockspec$") then
       return nil, "Invalid argument: 'make' takes a rockspec as a parameter. See help."
    end