Minor fixes

 - Update diffmatchpatch to Google's version
 - Allow --help and -h
 - Add source mapping to patchspecs
 - Add _G.arg to environment

Author: SquidDev

bsrocks/bin/bsrocks.lua

@@ -2,6 +2,11 @@ local commands = { }
 
 local function addCommand(command)
 	commands[command.name] = command
+	if command.alias then
+		for _, v in ipairs(command.alias) do
+			commands[v] = command
+		end
+	end
 end
 
 local utils = require "bsrocks.lib.utils"
@@ -86,10 +91,17 @@ addCommand({
 				printColoured("    " .. command.help, colours.lightGrey)
 			end
 		end
-	end,
+	end
 })
 
 -- Default to printing help messages
-local foundCommand = getCommand(... or "help")
+local cmd = ...
+if not cmd or cmd == "-h" or cmd == "--help" then
+	cmd = "help"
+elseif select(2, ...) == "-h" or select(2, ...) == "--help" then
+	return getCommand("help").execute(cmd)
+end
+
+local foundCommand = getCommand(cmd)
 local args = {...}
 return foundCommand.execute(select(2, unpack(args)))

bsrocks/commands/admin/addpatchspec.lua

@@ -1,4 +1,3 @@
-local download = require "bsrocks.downloaders"
 local fileWrapper = require "bsrocks.lib.files"
 local manifest = require "bsrocks.rocks.manifest"
 local patchDirectory = require "bsrocks.lib.settings".patchDirectory

bsrocks/commands/admin/addrockspec.lua

@@ -1,4 +1,3 @@
-local download = require "bsrocks.downloaders"
 local fileWrapper = require "bsrocks.lib.files"
 local manifest = require "bsrocks.rocks.manifest"
 local patchDirectory = require "bsrocks.lib.settings".patchDirectory

bsrocks/commands/admin/apply.lua

@@ -20,14 +20,14 @@ local function execute(...)
 		end
 	end
 
-	local changed = false
+	local hasChanged = false
 	for name, data in pairs(patched) do
 		local original = fs.combine(patchDirectory, "rocks-original/" .. name)
 		local patch = fs.combine(patchDirectory, "rocks/" .. name)
 		local changed = fs.combine(patchDirectory, "rocks-changes/" .. name)
 
 		if force or not fs.isDir(changed) then
-			changed = true
+			hasChanged = true
 			log("Applying " .. name)
 
 			fileWrapper.assertExists(original, "original sources for " .. name, 0)
@@ -46,7 +46,7 @@ local function execute(...)
 		end
 	end
 
-	if not changed then
+	if not hasChanged then
 		error("No packages to patch", 0)
 	end
 end

bsrocks/commands/admin/fetch.lua

@@ -23,17 +23,17 @@ local function execute(...)
 		end
 	end
 
-	local changed = false
-	for name, patchspec in pairs(patched) do
+	local hasChanged = false
+	for name, patchS in pairs(patched) do
 		local dir = fs.combine(patchDirectory, "rocks-original/" .. name)
 		if force or not fs.isDir(dir) then
-			changed = true
+			hasChanged = true
 			log("Fetching " .. name)
 
 			fs.delete(dir)
 
-			local version = patchspec.version
-			if not patchspec.version then
+			local version = patchS.version
+			if not patchS.version then
 				error("Patchspec" .. name .. " has no version", 0)
 			end
 
@@ -42,12 +42,12 @@ local function execute(...)
 				error("Cannot find '" .. name .. "'", 0)
 			end
 
-			local rock = rockspec.fetchRockspec(manifest.server, name, patchspec.version)
+			local rock = rockspec.fetchRockspec(manifest.server, name, patchS.version)
 
 			local files = rockspec.extractFiles(rock)
 			if #files == 0 then error("No files for " .. name .. "-" .. version, 0) end
 
-			local downloaded = download(rock.source, files)
+			local downloaded = download(patchspec.extractSource(rock, patchS), files)
 
 			if not downloaded then error("Cannot find downloader for " .. rock.source.url, 0) end
 
@@ -59,7 +59,7 @@ local function execute(...)
 		end
 	end
 
-	if not changed then
+	if not hasChanged then
 		error("No packages to fetch", 0)
 	end
 

bsrocks/commands/desc.lua

@@ -1,4 +1,5 @@
 local dependencies = require "bsrocks.rocks.dependencies"
+local download = require "bsrocks.downloaders"
 local install = require "bsrocks.rocks.install"
 local match = require "bsrocks.lib.diffmatchpatch".match_main
 local printColoured = require "bsrocks.lib.utils".printColoured
@@ -55,6 +56,11 @@ local function execute(name)
 		end
 	end
 
+	if not download(spec.source, nil) then
+		printColoured("Incompatible: No downloader", colours.red)
+		printColoured("for " .. spec.source.url, colours.lightGrey)
+	end
+
 	if spec.dependencies and #spec.dependencies > 0 then
 		printColoured("Dependencies", colours.orange)
 		local len = 0

bsrocks/commands/exec.lua

@@ -16,11 +16,14 @@ return {
 	description = description,
 	execute = function(file, ...)
 		if not file then error("Expected file", 0) end
+		file = shell.resolve(file)
 
-		local loaded, msg = loadfile(shell.resolve(file))
+		local loaded, msg = loadfile(file)
 		if not loaded then error(msg, 0) end
 
-		setfenv(loaded, env()._G)
+		local thisEnv = env()._G
+		thisEnv.arg = {[0] = fil, ... }
+		setfenv(loaded, thisEnv)
 
 		local args = {...}
 		xpcall(

bsrocks/commands/repl.lua

@@ -2,7 +2,7 @@ local env = require "bsrocks.env"
 local serialize = require "bsrocks.lib.dump"
 local parse = require "bsrocks.lib.parse"
 
-local function execute()
+local function execute(...)
 	local running = true
 	local thisEnv = env()._G
 
@@ -13,6 +13,7 @@ local function execute()
 
 	-- We need to pass through a secondary function to prevent tail calls
 	thisEnv._noTail = function(...) return ... end
+	thisEnv.arg = { [0] = "repl", ... }
 
 	-- As per @demhydraz's suggestion. Because the prompt uses Out[n] as well
 	local output = {}

bsrocks/downloaders/init.lua

@@ -14,6 +14,10 @@ local downloaders = {
 			if not repo then return end
 		end
 
+		if not files then
+			return true
+		end
+
 		print("Downloading " .. repo .. "@" .. branch)
 		return tree('https://raw.github.com/'..repo..'/'..branch..'/', files)
 	end,
@@ -22,10 +26,9 @@ local downloaders = {
 
 return function(source, files)
 	for _, downloader in ipairs(downloaders) do
-		local files = downloader(source, files)
-		if files then
-			print()
-			return files
+		local result = downloader(source, files)
+		if result then
+			return result
 		end
 	end
 

bsrocks/downloaders/tree.lua

@@ -56,8 +56,9 @@ local function tree(prefix, files)
 	end
 
 	parallel.waitForAll(unpack(callbacks))
+	print()
 	if errored then
-		error("Cannot download " .. repo .. "@" .. branch)
+		error("Cannot download " .. prefix)
 	end
 
 	return result

bsrocks/env/init.lua

@@ -1,5 +1,17 @@
+local function addWithMeta(src, dest)
+	for k, v in pairs(src) do
+		if dest[k] == nil then
+			dest[k] = v
+		end
+	end
+
+	local meta = getmetatable(src)
+	if type(meta) == "table" and type(meta.__index) == "table" then
+		return addWithMeta(meta.__index, dest)
+	end
+end
+
 return function(options)
-	local globals = _G
 	options = options or {}
 
 	local nImplemented = function(name)
@@ -36,15 +48,7 @@ return function(options)
 	end
 
 	-- Copy functions across
-	for k,v in pairs(globals) do
-		if not _G[k] then
-			_G[k] = v
-		end
-	end
-
-	-- FIXME:
-	_G.shell = shell
-	_G.multishell = multishell
+	addWithMeta(getfenv(), _G)
 
 	function _G.load(func, chunk)
 		local cache = {}

bsrocks/env/package.lua

@@ -16,6 +16,7 @@ return function(env)
 		preload = {},
 		path = path,
 		config = "/\n;\n?\n!\n-",
+		cpath = "",
 	}
 	-- Set as a global
 	_G.package = package