Tamar 0.7.2 → 0.7.3

data/src/luadist/dist.info

@@ -0,0 +1,20 @@
+--- This file is part of LuaDist project
+
+name = "luadist"
+version = "1.2"
+
+desc = "Simple Lua Module Development, Distribution and Deployment Tool."
+maintainer = "Peter Drahoš"
+author = "Peter Drahoš, Peter Kapec, David Manura"
+license = "MIT/X11"
+url = "http://www.luadist.org"
+
+depends = {
+	"lua ~> 5.1",
+	"md5 >= 1.1",
+	"luasocket >= 2.0.2",
+	"luafilesystem >= 1.4.1",
+	"luasec >= 0.4",
+	"unzip >= 6.0"
+}
+

data/src/luadist/dist/config.lua.in

@@ -0,0 +1,108 @@
+--- LuaDist configuration
+-- The contents of this file is automaticaly generated.
+-- Feel free to edit to suit your needs.
+
+local write = io.write
+local flush = io.flush
+local getenv = os.getenv
+
+-- Look for _PROGDIR by default
+local path = _PROGDIR
+if path then path = path:gsub("\\", "/") .. "/.." end
+
+module ("dist.config")
+
+-- LuaDist Install Identification
+version 	= "@DIST_VERSION@"   -- Current LuaDist version
+arch			= "@DIST_ARCH@"			 -- Host architecture
+type			= "@DIST_TYPE@"			 -- Host type
+
+-- Behavior
+binary  = true		-- Use binary dists.
+source  = true		-- Use source dists (requires CMake and MinGW/gcc/VS to be installed).
+test    = false		-- Run tests before install.
+verbose = false		-- Print verbose output.
+debug   = false		-- Start debug mod. Will keep temporary directories too.
+proxy   = false		-- HTTP proxy to use. False for none, otherwise the proxy address.
+timeout = 10		  -- HTTP fetch timeout (seconds)
+cache   = 5*60		-- Cache timeout (seconds)
+
+--- Packages provided by host
+-- If you install any packages manually or using your host OS installer you can add the name-version
+-- here, LuaDist will NOT install these modules and will search for the libraries in the host
+provides = {
+--	"unzip-6.0" 	-- Is available on OSX and most Unix/Linux based installs.
+}
+
+-- Paths
+root  = path or getenv("DIST_ROOT") or "/"
+temp  = root .. "/tmp"		-- Full path temp
+log   = temp .. "/luadist.log" 	-- Log file
+dists = "share/luadist/dists"
+
+-- URLs of repositories to search for dists. http:// or file:// URLs are cecognized atm.
+repo = {
+	--- Examples
+	-- "file:///home/joe/my_dists"		-- Private Local Repository Unix
+	-- "file://C:/MyDists"				-- Private Local Repository Windows
+	-- "http://myserver.tld/repo"		-- Private Online Repository
+
+	--- Use local repo to speed things up when re-deploying
+	-- "file://" .. root .. "/dist", 
+
+	--- Official repo
+	"https://github.com/LuaDist/Repository/raw/master/"
+}
+
+--- !!! Do not edit below unless you know what you are doing. !!!
+-- Additional CMake variables to pass to build
+variables	= {
+    --- Install defaults
+    INSTALL_BIN                       = "@INSTALL_BIN@",
+    INSTALL_LIB                       = "@INSTALL_LIB@",
+    INSTALL_INC                       = "@INSTALL_INC@",
+    INSTALL_ETC                       = "@INSTALL_ETC@",
+    INSTALL_LMOD                      = "@INSTALL_LMOD@",
+    INSTALL_CMOD                      = "@INSTALL_CMOD@",
+  
+	--- LuaDist specific variables
+	DIST_VERSION                       = version,
+	DIST_ARCH                          = arch,
+	DIST_TYPE                          = type,
+	
+	-- CMake specific setup
+	CMAKE_GENERATOR                    = "@CMAKE_GENERATOR@",
+	CMAKE_BUILD_TYPE                   = "@CMAKE_BUILD_TYPE@",
+
+    -- RPath functionality
+    CMAKE_SKIP_BUILD_RPATH             = "@CMAKE_SKIP_BUILD_RPATH@",
+    CMAKE_BUILD_WITH_INSTALL_RPATH     = "@CMAKE_BUILD_WITH_INSTALL_RPATH@",
+    CMAKE_INSTALL_RPATH                = "@CMAKE_INSTALL_RPATH@",
+    CMAKE_INSTALL_RPATH_USE_LINK_PATH  = "@CMAKE_INSTALL_RPATH_USE_LINK_PATH@",
+    CMAKE_INSTALL_NAME_DIR             = "@CMAKE_INSTALL_NAME_DIR@",
+
+	-- OSX specific
+	CMAKE_OSX_ARCHITECTURES            = "@CMAKE_OSX_ARCHITECTURES@",
+
+}
+
+-- Commands to use for building. (CMake 2.8+)
+cmake           = "cmake"
+cmakeDebug      = "cmake -DCMAKE_VERBOSE_MAKEFILE=true -DCMAKE_BUILD_TYPE=Debug"
+ctest           = "ctest"
+ctestDebug      = "ctest"
+make            = "cmake --build . --target install --clean-first"
+makeDebug       = "cmake --build . --target install --clean-first"
+
+-- Add -j option to make in case of unix makefiles to speed up builds
+if (variables.CMAKE_GENERATOR == "Unix Makefiles") then
+        make = make .. " -- -j6"
+        makeDebug = makeDebug .. " -- -j6"
+end
+
+-- Function used to display messages, warnings and errors
+message = function(...)
+  write(...)
+  write("\n")
+  flush()
+end

data/src/luadist/dist/dep.lua

@@ -0,0 +1,283 @@
+--- LuaDist dependency functions
+-- Peter Drahoš, LuaDist Project, 2010
+-- Original Code borrowed from LuaRocks Project
+
+--- Dependency handling functions.
+-- Dependencies are represented in LuaDist through strings with
+-- a dist name followed by a comma-separated list of constraints.
+-- Each constraint consists of an operator and a version number.
+-- In this string format, version numbers are represented as
+-- naturally as possible, like they are used by upstream projects
+-- (e.g. "2.0beta3"). Internally, LuaDist converts them to a purely
+-- numeric representation, allowing comparison following some
+-- "common sense" heuristics. The precise specification of the
+-- comparison criteria is the source code of this module, but the
+-- test/test_deps.lua file included with LuaDist provides some
+-- insights on what these criteria are.
+
+module ("dist.dep", package.seeall)
+
+local distr     = require "dist"
+local log	    = require "dist.log"
+local manif 	= require "dist.manifest"
+
+local operators = {
+	["=="] 	= "==",
+	["~="] 	= "~=",
+	[">"] 	= ">",
+	["<"] 	= "<",
+	[">="] 	= ">=",
+	["<="] 	= "<=",
+	["~>"] 	= "~>",
+	-- plus some convenience translations
+	[""] 	= "==",
+	["-"]	= "==",
+	["="] 	= "==",
+	["!="] 	= "~="
+}
+
+local deltas = {
+   scm =   -100,
+   rc =    -1000,
+   pre =   -10000,
+   beta =  -100000,
+   alpha = -1000000,
+   work =  -10000000,
+}
+
+local version_mt = {
+   --- Equality comparison for versions.
+   -- All version numbers must be equal.
+   -- If both versions have revision numbers, they must be equal;
+   -- otherwise the revision number is ignored.
+   -- @param v1 table: version table to compare.
+   -- @param v2 table: version table to compare.
+   -- @return boolean: true if they are considered equivalent.
+   __eq = function(v1, v2)
+      if #v1 ~= #v2 then
+         return false
+      end
+      for i = 1, #v1 do
+         if v1[i] ~= v2[i] then
+            return false
+         end
+      end
+      if v1.revision and v2.revision then
+         return (v1.revision == v2.revision)
+      end
+      return true
+   end,
+   --- Size comparison for versions.
+   -- All version numbers are compared.
+   -- If both versions have revision numbers, they are compared;
+   -- otherwise the revision number is ignored.
+   -- @param v1 table: version table to compare.
+   -- @param v2 table: version table to compare.
+   -- @return boolean: true if v1 is considered lower than v2.
+   __lt = function(v1, v2)
+      for i = 1, math.max(#v1, #v2) do
+         local v1i, v2i = v1[i] or 0, v2[i] or 0
+         if v1i ~= v2i then
+            return (v1i < v2i)
+         end
+      end
+      if v1.revision and v2.revision then
+         return (v1.revision < v2.revision)
+      end
+      return false
+   end
+}
+
+local version_cache = {}
+setmetatable(version_cache, {
+   __mode = "kv"
+})
+
+--- Parse a version string, converting to table format.
+-- A version table contains all components of the version string
+-- converted to numeric format, stored in the array part of the table.
+-- If the version contains a revision, it is stored numerically
+-- in the 'revision' field. The original string representation of
+-- the string is preserved in the 'string' field.
+-- Returned version tables use a metatable
+-- allowing later comparison through relational operators.
+-- @param vstring string: A version number in string format.
+-- @return table or nil: A version table or nil
+-- if the input string contains invalid characters.
+function parseVersion(vstring)
+	if not vstring then return nil end
+	assert(type(vstring) == "string")
+
+	local cached = version_cache[vstring]
+	if cached then
+		return cached
+	end
+
+	local version = {}
+	local i = 1
+
+	local function add_token(number)
+		version[i] = version[i] and version[i] + number/100000 or number
+		i = i + 1
+	end
+
+	-- trim leading and trailing spaces
+	vstring = vstring:match("^%s*(.*)%s*$")
+	version.string = vstring
+	-- store revision separately if any
+	local main, revision = vstring:match("(.*)%-(%d+)$")
+	if revision then
+		vstring = main
+		version.revision = tonumber(revision)
+	end
+	while #vstring > 0 do
+		-- extract a number
+		local token, rest = vstring:match("^(%d+)[%.%-%_]*(.*)")
+		if token then
+			add_token(tonumber(token))
+		else
+			-- extract a word
+			token, rest = vstring:match("^(%a+)[%.%-%_]*(.*)")
+			if not token then
+				return nil
+			end
+			local last = #version
+			version[i] = deltas[token] or (token:byte() / 1000)
+		end
+		vstring = rest
+	end
+	setmetatable(version, version_mt)
+	version_cache[vstring] = version	
+	return version
+end
+
+--- Utility function to compare version numbers given as strings.
+-- @param a string: one version.
+-- @param b string: another version.
+-- @return boolean: True if a > b.
+function compareVersions(a, b)
+	return parseVersion(a) > parseVersion(b)
+end
+
+--- Consumes a constraint from a string, converting it to table format.
+-- For example, a string ">= 1.0, > 2.0" is converted to a table in the
+-- format {op = ">=", version={1,0}} and the rest, "> 2.0", is returned
+-- back to the caller.
+-- @param input string: A list of constraints in string format.
+-- @return (table, string) or nil: A table representing the same
+-- constraints and the string with the unused input, or nil if the
+-- input string is invalid.
+local function parseConstraint(input)
+	assert(type(input) == "string")
+
+	local op, version, rest = input:match("^([<>=~!]*)%s*([%w%.%_%-]+)[%s,]*(.*)")
+	op = operators[op]
+	version = parseVersion(version)
+	if not op or not version then return nil end
+	return { op = op, version = version }, rest
+end
+
+--- Convert a list of constraints from string to table format.
+-- For example, a string ">= 1.0, < 2.0" is converted to a table in the format
+-- {{op = ">=", version={1,0}}, {op = "<", version={2,0}}}.
+-- Version tables use a metatable allowing later comparison through
+-- relational operators.
+-- @param input string: A list of constraints in string format.
+-- @return table or nil: A table representing the same constraints,
+-- or nil if the input string is invalid.
+function parseConstraints(input)
+	assert(type(input) == "string")
+
+	local constraints, constraint = {}, nil
+	while #input > 0 do
+		constraint, input = parseConstraint(input)
+		if constraint then
+			table.insert(constraints, constraint)
+	  	else
+			return nil
+		end
+	end
+	return constraints
+end
+
+--- A more lenient check for equivalence between versions.
+-- This returns true if the requested components of a version
+-- match and ignore the ones that were not given. For example,
+-- when requesting "2", then "2", "2.1", "2.3.5-9"... all match.
+-- When requesting "2.1", then "2.1", "2.1.3" match, but "2.2"
+-- doesn't.
+-- @param version string or table: Version to be tested; may be
+-- in string format or already parsed into a table.
+-- @param requested string or table: Version requested; may be
+-- in string format or already parsed into a table.
+-- @return boolean: True if the tested version matches the requested
+-- version, false otherwise.
+local function partialMatch(version, requested)
+	assert(type(version) == "string" or type(version) == "table")
+	assert(type(requested) == "string" or type(version) == "table")
+
+	if type(version) ~= "table" then version = parseVersion(version) end
+	if type(requested) ~= "table" then requested = parseVersion(requested) end
+	if not version or not requested then return false end
+
+	for i = 1, #requested do
+		if requested[i] ~= version[i] then return false end
+	end
+	if requested.revision then
+		return requested.revision == version.revision
+	end
+	return true
+end
+
+--- Check if a version satisfies a set of constraints.
+-- @param version table: A version in table format
+-- @param constraints table: An array of constraints in table format.
+-- @return boolean: True if version satisfies all constraints,
+-- false otherwise.
+function matchConstraints(version, constraints)
+	assert(type(version) == "table")
+	assert(type(constraints) == "table")
+	local ok = true
+	setmetatable(version, version_mt)
+	for _, constr in pairs(constraints) do
+		local constr_version = constr.version
+      		setmetatable(constr.version, version_mt)
+		if     constr.op == "==" then ok = version == constr_version
+		elseif constr.op == "~=" then ok = version ~= constr_version
+		elseif constr.op == ">"  then ok = version >  constr_version
+		elseif constr.op == "<"  then ok = version <  constr_version
+		elseif constr.op == ">=" then ok = version >= constr_version
+		elseif constr.op == "<=" then ok = version <= constr_version
+		elseif constr.op == "~>" then ok = partialMatch(version, constr_version)
+		end
+		if not ok then break end
+	end
+	return ok
+end
+
+--- Check if a version string is satisfied by a constraint string.
+-- @param version string: A version in string format
+-- @param constraints string: Constraints in string format.
+-- @return boolean: True if version satisfies all constraints,
+-- false otherwise.
+function constrain(version, constraints)
+	local const = parseConstraints(constraints)
+	local ver = parseVersion(version)
+	if const and ver then
+		return matchConstraints(ver, const)
+	end
+	return nil, "Error parsing versions."
+end
+
+--- Split dist name into name and constraints.
+-- @param name string: A string containing name and version constraints eg. "lua-5.1.4" or "luajit >= 1.0 < 2.0"
+-- @return string, string: Returns separated name and constraints
+function split(name)
+	    local cut = string.find(name, "[%s-=<>~]+%d")
+	    if cut then
+	    		-- Cut the string and remove - from version if needed.
+	            return string.sub(name, 0, cut-1), string.gsub(string.sub(name, cut), "^[-%s]", "")
+	    end
+	    return name, nil
+end
+

data/src/luadist/dist/fetch.lua

@@ -0,0 +1,234 @@
+--- LuaDist URL fetch functions
+-- Peter Drahoš, LuaDist Project, 2010
+
+--- This module is responsible for downloading contents using URIs. 
+-- It should handle at least HTTP and FILE URIs as well as system paths transparently.
+-- 2DO: support for more protocols if demanded.
+-- Two functions are provided. Notice that http requests are cached.
+-- download - To download dists.
+-- get - To directly obtain manifests.
+
+module ("dist.fetch", package.seeall)
+
+local config 	= require "dist.config"
+local sys 		= require "dist.sys"
+local log		= require "dist.log"
+
+-- Download contents directly from HTTP source to file
+local function downloadHTTP(src, file)
+    local ltn12	= require "ltn12"
+    local http  = require "socket.http"
+
+    local request = {
+    	url = src,
+    	headers = {
+    		USERAGENT = "LuaDist",
+    		TIMEOUT = config.timeout,
+    	},
+    	sink = ltn12.sink.file(assert(io.open(file, "wb"))),
+    	redirect = true,
+    }
+    if config.proxy then request.proxy = config.proxy end
+
+    local ok, err = http.request(request)
+    if not ok then return nil, "Failed to get contents of " .. src .. " error: " .. err end
+    return true
+end
+
+-- Download contents directly from HTTP source to file
+local function downloadHTTPS(src, file)
+    local ltn12	= require "ltn12"
+    local https  = require "ssl.https"
+    
+    local request = {
+    	url = src,
+    	headers = {
+    		USERAGENT = "LuaDist",
+    		TIMEOUT = config.timeout,
+    	},
+        protocol = "tlsv1",
+        options = "all",
+        verify = "none",
+    	sink = ltn12.sink.file(assert(io.open(file, "wb"))),
+    }
+
+    local ok, err = https.request(request)
+    if not ok then return nil, "Failed to get contents of " .. src .. " error: " .. err end
+    return true
+end
+
+--- Fetch file from URI into destination.
+-- @param src string: URI to fetch file from. Accepts paths too.
+-- @param dest string: Destination dir, if not provided temporary dir will be used.
+-- @return path, log: Path the file was downloaded and the resulting log message.
+function download(src, dest)
+	assert(type(src) == "string", "fetch.download: Argument 'src' is not a string.")
+	assert(not dest or type(dest) == "string", "fecth.download: Argument 'dest' is not a string.")
+	
+	-- Dont waste time
+	if src == dest then return true end
+	
+	-- Make sure all paths are absolute and set
+	dest = sys.path(dest) or config.temp
+	src = sys.path(src)
+	
+	-- Test destination existstence
+	local ok, err = sys.isDir(dest)
+	if not ok then return nil, "Destination " .. dest .. " is not a directory." end
+	
+	-- Construct destination filename
+	local name = src:match("([^/]+)$")
+	dest = sys.path(dest, name)
+	part = dest .. ".part"
+
+	-- Test if the file is local
+	local file = sys.path((src:gsub("^file://","")))
+	if sys.isFile(file) then
+		local ok, err = sys.copy(file, dest)
+		if not ok then return nil, "Failed to coply local file " .. file .. " to " .. dest end
+		return dest, "Succesfuly copied " .. file .. " to " .. dest
+	elseif src:match("^file://") then
+		return nil, "Failed to get contents of " .. src .. " error: not found"
+	end -- else uncertain
+
+	-- Cache check
+	if config.cache then
+		local md5 = require "md5"
+		local lfs = require "lfs"
+		
+		local path = sys.path(config.temp, "luadist_cache")
+		local cache = sys.path(path, md5.sumhexa(src))
+		
+		if ((lfs.attributes(cache, "modification") or 0) + config.cache) > os.time() then
+			sys.copy(cache, dest)
+			return dest, "Retrieved from cache."
+		end
+	end
+
+	-- Depeding on the protocol try obtaining the source
+	local ok, err
+	if (src:match("http://")) then ok, err = downloadHTTP(src, part) end
+	if (src:match("https://")) then ok, err = downloadHTTPS(src, part) end
+	
+	if not ok then return nil, err end
+	sys.move(part, dest)
+
+	-- Save cache
+	if config.cache then
+		local md5 = require "md5"
+		
+		local path = sys.path(config.temp, "luadist_cache")
+		local cache = sys.path(path, md5.sumhexa(src))
+		sys.makeDir(path)
+		sys.copy(dest, cache)
+	end
+	
+	if not ok then return nil, "Failed to get contents of " .. src .. " error: " .. err end
+	return dest, "Succesfuly downloaded " .. src .. " to " .. dest
+end
+
+-- Obtain contents directly from HTTP source
+local function getHTTP(src)
+    local ltn12	= require "ltn12"
+    local http  = require "socket.http"
+
+    local contents = {}
+    local request = {
+    	url = src,
+    	headers = {
+    		USERAGENT = "LuaDist",
+    		TIMEOUT = config.timeout,
+    	},
+    	sink = ltn12.sink.table(contents),
+    	redirect = true,
+    }
+    if config.proxy then request.proxy = config.proxy end
+
+    local ok, err = http.request(request)
+    if not ok then return nil, "Failed to get contents of " .. src .. " error: " .. err end
+    return table.concat(contents)
+end
+
+-- Obtain contents directly from HTTP source
+local function getHTTPS(src)
+    local ltn12	= require "ltn12"
+    local https  = require "ssl.https"
+    
+    local contents = {}
+    local request = {
+    	url = src,
+    	headers = {
+    		USERAGENT = "LuaDist",
+    		TIMEOUT = config.timeout,
+    	},
+        protocol = "tlsv1",
+        options = "all",
+        verify = "none",
+    	sink = ltn12.sink.table(contents),
+    }
+
+    local ok, err = https.request(request)
+
+    if not ok then return nil, "Failed to get contents of " .. src .. " error: " .. err end
+    return table.concat(contents)
+end
+
+--- Directly get file contents from URI using luasocket.
+-- @param src string: URI to fetch file from. Accepts paths too.
+-- @return text, log: Contents of the URL file or nil and log message.
+function get(src)
+	assert(type(src) == "string", "fetch.get: Argument 'src' is not a string.")
+
+	-- Test if file is local
+	local file = sys.path((src:gsub("^file://","")))
+	if sys.isFile(file) then
+		local handle = io.open(file, "rb")
+		if not handle then return nil, "Failed to get contents of " .. file end
+		local ret = handle:read("*all")
+		handle:close()
+		return ret, "Succesfuly obtained contents of " .. file
+	elseif src:match("^file://") then
+		return nil, "Failed to get contents of " .. src .. " error: not found"
+	end -- else uncertain
+
+	-- Cache check
+	if config.cache then
+		local md5 = require "md5"
+		local lfs = require "lfs"
+		
+		local path = sys.path(config.temp, "luadist_cache")
+		local cache = sys.path(path, md5.sumhexa(src))
+		
+		if ((lfs.attributes(cache, "modification") or 0) + config.cache) > os.time() then
+			local file = io.open(cache, "rb")
+			if file then
+				local data = file:read("*all")
+				file:close()
+				return data, "Retrieved from cache."
+			end
+		end
+	end
+	
+	-- Depeding on the protocol try obtaining the source
+	local data, err
+	if (src:match("http://")) then data, err = getHTTP(src) end
+	if (src:match("https://")) then data, err = getHTTPS(src) end
+	
+	if (not data) then return nil, err end
+		
+	-- Save cache
+	if config.cache then
+		local md5 = require "md5"
+		
+		local path = sys.path(config.temp, "luadist_cache")
+		local cache = sys.path(path, md5.sumhexa(src))
+		sys.makeDir(path)
+		local file = io.open(cache, "wb")
+		if file then
+			file:write(data)
+			file:close()
+		end
+	end
+	
+	return data, "Succesfuly obtained contents of " .. src
+end