Producing rockspec 2.6.0-1

.gitattributes

@@ -0,0 +1,3 @@
+*.lua linguist-generated
+out/* linguist-generated
+Makefile -linguist-detectable

.gitignore

@@ -1 +1,3 @@
-*.lua
+bin/*.lua
+moonbuild/*.lua
+moonbuild/*/*.lua

Alfons.moon

@@ -1,8 +1,14 @@
+require 'moonscript'
+moonbuild = require 'moonbuild'
+
 tasks:
-	build: =>
-		load 'moonbuild'
-		tasks.moonbuild j: true
 	release: =>
 		error "no version provided" unless @v
 		tasks.build!
 		sh "rockbuild -m -t #{@v} upload"
+
+	watch: => watch {'.'}, {'.git'}, 'live', (glob '*.moon'), pcall -> moonbuild j: true
+	build: => moonbuild j: true
+	install: => moonbuild 'install', j: true
+	clean: => moonbuild 'clean'
+	mrproper: => moonbuild 'mrproper'

Build.moon

@@ -1,46 +1,62 @@
-public var 'MOONC', 'moonc'
+public var AMALG: 'amalg.lua'
-public var 'AMALG', 'amalg.lua'
+public var RM: 'rm', '-f', '--'
-public var 'RM', 'rm', '-f', '--'
+public var LUA: 'lua5.3'
-public var 'LUA', 'lua5.3'
 
-var 'LIB_SRC', _.wildcard 'moonbuild/**.moon'
+var LIB_SRC: _.wildcard 'moonbuild/**.moon'
-var 'BIN_SRC', _.wildcard 'bin/*.moon'
+var BIN_SRC: _.wildcard 'bin/*.moon'
 
-var 'LIB_LUA', _.patsubst LIB_SRC, '%.moon', '%.lua'
+var LIB_LUA: _.patsubst LIB_SRC, '%.moon', '%.lua'
-var 'BIN_LUA', _.patsubst BIN_SRC, '%.moon', '%.lua'
+var BIN_LUA: _.patsubst BIN_SRC, '%.moon', '%.lua'
-var 'BIN', _.patsubst BIN_LUA, 'bin/%.lua', 'out/%'
+var BIN: _.patsubst BIN_LUA, 'bin/%.lua', 'out/%'
+var LIB: 'out/moonbuild.lua'
 
-var 'MODULES', _.foreach (_.patsubst LIB_LUA, '%.lua', '%'), => @gsub '/', '.'
+var MODULES: _.foreach (_.patsubst LIB_LUA, '%.lua', '%'), => @gsub '/', '.'
 
 with public default target 'all'
 	\after 'bin'
 	\after 'lib'
 
+with public target 'install'
+	\after 'install-bin'
+	\after 'install-lib'
+
+with public target 'install-bin'
+	\depends BIN
+	\produces _.patsubst BIN, 'out/%', '/usr/local/bin/%'
+	\fn => _.cmd 'sudo', 'cp', @infile, @out
+	\sync!
+
+with public target 'install-lib'
+	\depends LIB
+	\produces "/usr/local/share/lua/#{LUA\gsub 'lua', ''}/moonbuild.lua"
+	\fn => _.cmd 'sudo', 'cp', @infile, @out
+	\sync!
+
 with public target 'clean'
 	\fn => _.cmd RM, LIB_LUA
 	\fn => _.cmd RM, BIN_LUA
 
 with public target 'mrproper'
 	\after 'clean'
-	\fn => _.cmd RM, BIN
+	\fn => _.cmd RM, BIN, LIB
 
-with public target 'bin'
+with pipeline! -- lib
-	\depends BIN
+	\sources LIB_SRC
+	\step 'compile-lib'
+		pattern: {'%.moon', '%.lua'}
+		fn: => _.moonc @infile, @out
+	\step 'lib'
+		output: LIB
+		fn: => _.cmd AMALG, '-o', @out, '-s', 'moonbuild/init.lua', _.exclude MODULES, 'moonbuild.init'
 
-with public target 'lib'
+with pipeline! -- bin
-	\depends LIB_LUA
+	\sources BIN_SRC
-
+	\step 'compile-bin'
-with target BIN, pattern: 'out/%'
+		pattern: {'%.moon', '%.lua'}
-	\depends 'bin/%.lua'
+		fn: => _.moonc @infile, @out
-	\depends LIB_LUA
+	\step 'bin'
-	\produces 'out/%'
+		pattern: {'bin/%.lua', 'out/%'}
-	\mkdirs!
+		mkdirs: true
-	\fn =>
+		fn: =>
-		_.cmd AMALG, '-o', @outfile, '-s', @infile, MODULES
+			_.writefile @out, "#!/usr/bin/env #{LUA}\n#{_.readfile @infile}"
-		_.writefile @outfile, "#!/usr/bin/env #{LUA}\n#{_.readfile @outfile}"
+			_.cmd 'chmod', '+x', @out
-		_.cmd 'chmod', '+x', @outfile
-
-with target {LIB_LUA, BIN_LUA}, pattern: '%.lua'
-	\depends '%.moon'
-	\produces '%.lua'
-	\fn => _.moonc @infile, @outfile

Makefile

@@ -21,19 +21,22 @@ clean:
 	$(RM) $(BIN_LUA)
 
 mrproper: clean
-	$(RM) $(BIN)
+	$(RM) $(BIN) out/moonbuild.lua
 
 bin: $(BIN)
 
-lib: $(LIB_LUA)
+lib: $(LIB_LUA) out/moonbuild.lua
 
 out/%: bin/%.lua $(LIB_LUA)
 	@mkdir -p `dirname $@`
-	$(AMALG) -o $@.body -s $< $(MODULES)
 	@printf '#!/usr/bin/env %s\n' $(LUA) > $@.headline
-	@cat $@.headline $@.body > $@
+	@cat $@.headline $< > $@
-	@rm $@.headline $@.body
+	@rm $@.headline
 	chmod +x $@
 
+out/moonbuild.lua: moonbuild/init.lua $(LIB_LUA)
+	@mkdir -p `dirname $@`
+	$(AMALG) -o $@ -s $< $(MODULES)
+
 %.lua: %.moon
 	moonc $^

README.md

@@ -24,11 +24,13 @@ You will need `argparse` and `moonscript` installed from luarocks, and `luaposix
 
 ### Bootstrapping
 You can build moonbuild with itself: `moon bin/moonbuild.moon -qjy`.  
-This will leave the binary ready to be used as `out/moonbuild`.
+This will leave the binary ready to be used as `out/moonbuild` (it will still depend on the library to be used).  
+The binary and library can then be installed with `bin/moonbuild install`.
 
-### Using make
+You can combine these steps with `moon bin/moonbuild.moon -qjy install` which will build and install moonbuild.
-You can also build moonbuild with make: `make`.
+
-This will leave the binary ready to be used as `out/moonbuild`.
+### With `Alfons`
+Alfons can use the devel version of moonbuild directly from its sources, so `alfons build` and `alfons install` will work directly.
 
 ## Docs
 TODO

bin/moonbuild.moon

@@ -1,14 +1,13 @@
 -- load everything we need
 import loadfile from require 'moonscript.base'
-Context = require 'moonbuild.context'
+import Context, DepGraph, Executor from require 'moonbuild'
-Variable = require 'moonbuild.core.Variable'
+Variable = (require 'moonbuild')['core.Variable']
-DepGraph = require 'moonbuild.core.DAG'
+import parseargs from (require 'moonbuild')['_cmd.common']
-import parseargs from require 'moonbuild._cmd.common'
+argparse = require 'argparse'
 import sort, concat from table
 import exit from os
 
 -- parse the arguments
-argparse = require 'argparse'
 parser = with argparse "moonbuild", "A build system in moonscript"
 	\option '-b --buildfile', "Build file to use", 'Build.moon'
 	\option '-j --parallel', "Sets the number of parallel tasks, 'y' to run as many as we have cores", '1'
@@ -74,15 +73,8 @@ dag = DepGraph ctx, targets
 print "Created dependancy graph" if args.verbose
 
 -- execute the build
-if args.parallel==1
+nparallel = args.parallel == 'y' and Executor\getmaxparallel! or args.parallel
-	Executor = require 'moonbuild.core.singleprocessexecutor'
+print "Building with #{nparallel} max parallel process#{nparallel>1 and "es" or ""}" if args.verbose
-	executor = Executor dag, args.parallel
+executor = Executor dag, nparallel
-	executor\execute args
+executor\execute args
-else
-	ok, Executor = pcall -> require 'moonbuild.core.multiprocessexecutor'
-	Executor = require 'moonbuild.core.singleprocessexecutor' unless ok
-	nparallel = args.parallel == 'y' and Executor\getmaxparallel! or args.parallel
-	print "Building with #{nparallel} max parallel process#{nparallel>1 and "es" or ""}" if args.verbose
-	executor = Executor dag, nparallel
-	executor\execute args
 print "Finished" if args.verbose

bin/task.moon

@@ -1,24 +0,0 @@
--- load everything we need
-import loadfile from require 'moonscript.base'
-Context = require 'moonbuild.context'
-DepGraph = require 'moonbuild.core.DAG'
-
-tasks:
-	moonbuild: =>
-		args = {
-			nparallel: @parallel or @j
-			quiet: @quiet or @q
-			buildfile: @buildfile or @b
-			force: @force or @f
-		}
-		ctx = Context!
-		ctx\load (loadfile args.buildfile or 'Build.moon'), @
-		ctx\init!
-		dag = DepGraph ctx, #@ == 0 and ctx.defaulttargets or @
-		executor = do
-			Executor = do
-				ok, Executor = pcall -> require 'moonbuild.core.multiprocessexecutor'
-				ok and Executor or require 'moonbuild.core.singleprocessexecutor'
-			args.nparallel = Executor\getmaxparallel! if args.nparallel == true
-			Executor dag, args.nparallel
-		executor\execute args

moonbuild/_cmd.moon

@@ -17,5 +17,11 @@ cmd.backend = backend
 cmd.parseargs = parseargs
 cmd.escape = escape
 
+-- derived cmd functions
+_cmd = cmd.cmd
+_cmdrst = cmd.cmdrst
+cmd.cmdline = (cmdline) -> _cmd parseargs cmdline
+cmd.cmdlinerst = (cmdline) -> _cmdrst parseargs cmdline
+
 -- the library itself
-setmetatable cmd, __call: => {'cmd', 'cmdrst', 'sh'}
+setmetatable cmd, __call: => {'cmd', 'cmdrst', 'cmdline', 'cmdlinerst', 'sh'}

moonbuild/_common.moon

@@ -155,6 +155,7 @@ common.includes = includes
 common.patget = patget
 common.patset = patset
 common.patsubst = patsubst
+common.exclude = exclude
 common.min = min
 common.max = max
 common.minmax = minmax

moonbuild/_fs.moon

@@ -166,10 +166,16 @@ mkdir = (dir) ->
 	clearentry parent dir
 
 mkdirs = (dir) ->
-	return if isdir dir
+	if attr = attributes normalizepath dir
-	error "Can't mkdirs #{dir}: file exists" if exists dir
+		return if attr.mode == 'directory'
+		error "Can't mkdirs #{dir}: file exists"
 	mkdirs parent dir
-	mkdir dir
+	unless pcall -> actualmkdir dir
+		clearentry parent dir
+		clearentry dir
+		error "Failed to mkdirs #{dir}: last mkdir failed" unless isdir dir
+	clearentry parent dir
+	clearentry dir
 
 -- from the backend
 fs = {k, withcache fn for k, fn in pairs fs}

moonbuild/_util.moon

@@ -14,8 +14,8 @@ _cdeps = (cc, cflags, path) ->
 	rawlist = gsub (match raw, ':(.+)'), '\\\n', ' '
 	[v for v in gmatch rawlist, '%S+']
 cdeps = setmetatable {},
-	__index: (cc) => (cflags, path) -> _cdeps cc, cflags, path
+	__index: (cc) => (path, cflags) -> _cdeps cc, cflags, path
-	__call: (cflags, path) => _cdeps 'cc', cflags, path
+	__call: (path, cflags) => _cdeps 'cc', cflags, path
 
 readfile = (filename) ->
 	fd, err = open filename, 'rb'

moonbuild/core/DAG.moon

@@ -1,8 +1,8 @@
-import filter, foreach, flatten, patsubst from require 'moonbuild._common'
+import first, filter, foreach, flatten, patsubst, includes from require 'moonbuild._common'
 import runwithcontext from require 'moonbuild.compat.ctx'
 globalenv = require 'moonbuild.env.global'
 import exists, parent, mkdirs, clearentry, disableentry, attributes from require 'moonbuild._fs'
-import sort from table
+import sort, insert, remove from table
 import huge from math
 
 local DepNode, FileTarget
@@ -12,6 +12,8 @@ nodepriority = (a, b) ->
 	tb = type b.name
 	da = #a.deps
 	db = #b.deps
+	sa = a.sync
+	sb = b.sync
 	if ta=='string' and tb!='string'
 		return true
 	elseif ta!='string' and tb=='string'
@@ -20,6 +22,10 @@ nodepriority = (a, b) ->
 		return true
 	elseif a.priority < b.priority
 		return false
+	elseif sa and not sb
+		return false
+	elseif sb and not sa
+		return true
 	else
 		return da < db
 
@@ -28,6 +34,7 @@ transclosure = (obj, prop) ->
 	i = 1
 	set = {}
 	imp = (e) ->
+		return unless e[prop]
 		for v in *e[prop]
 			if not set[v]
 				elems[i], i = v, i+1
@@ -49,28 +56,64 @@ class DepGraph
 
 	addnode: (name) =>
 		return if @nodes[name]
-		elected = @resolvedeps name
+		elected = @topresolvedeps name
 		@nodes[name] = elected
 		for dep in *(transclosure elected, 'deps')
 			@nodes[dep.name] = dep
 			dep.deps = nil
 		elected.deps = nil
 
-	resolvedeps: (name) =>
+	topresolvedeps: (name) =>
+		errors = {}
+		ok, rst = pcall -> @resolvedeps name, nil, errors
+		if ok
+			rst
+		else
+			msg = {"Failed to resolve target \'#{name}\'\n"}
+			for e in *errors
+				if e.err\match '^moonbuild'
+					e.err = e.err\match ': (.+)$'
+			for i=#errors, 1, -1
+				e = errors[i]
+				insert msg, "#{string.rep '| ', e.level - 1}+-[#{e.name}] level #{e.level}: #{e.err}"
+			insert msg, ''
+			error table.concat msg, '\n'
+
+	resolvedeps: (name, level=1, errors={}) =>
 		do
 			node = @nodes[name]
-			return node, {} if node
+			if node
+				print "deps(#{name}) = #{node.name or '[noname]'}"
+				return node, {}
 		candidates = filter {@ctx.targets, FileTarget!}, (target) -> target\matches name
-		nodes = foreach candidates, (candidate) -> a: {pcall -> DepNode @, candidate, name}
+		nodes = foreach candidates, (candidate) -> a: {pcall -> DepNode @, candidate, name, level, errors}
 		resolved = foreach (filter nodes, (node) -> node.a[1]), (node) -> node.a[2]
 		sort resolved, nodepriority
-		resolved[1] or error "Cannot resolve target #{name}"
+		unless resolved[1]
+			err = "Cannot resolve target #{name}: #{#candidates} candidates, #{#resolved} resolved"
+			table.insert errors, {:name, :level, :err}
+			error err
+		resolved[1]
 
 	buildablenodes: =>
 		[v for k, v in pairs @nodes when v\canbuild! and not v.built]
 
+	reset: =>
+		n.built = false for k, n in pairs @nodes
+
+	resetchildren: (names) =>
+		done = {}
+		stack = [v for v in *names]
+		while #stack != 0
+			name = remove stack
+			continue if done[name]
+			done[name] = true
+			node = @nodes[name]
+			node.built = false
+			insert stack, n for n in *(node\children!)
+
 class DepNode
-	new: (@dag, target, @name) =>
+	new: (@dag, target, @name, @level, errors) =>
 		@priority = target.priority
 		@buildfunctions = target.buildfunctions
 		@mkdirs = target._mkdirs
@@ -80,45 +123,57 @@ class DepNode
 		@type = 'virtual' if #@outs == 0
 		@built = false
 
-		resolve = (name) -> @dag\resolvedeps patsubst @name, target.pattern, name
+		resolve = (name) -> @dag\resolvedeps (patsubst @name, target.pattern, name), level + 1, errors
 		after = flatten foreach target.needtargets, resolve
 		deps = flatten foreach target.infiles, resolve
 		if #target.depfunctions!=0
 			ctx = setmetatable {},
 				__index: (_, k) ->
 					switch k
-						when 'infile' then first deps
+						when 'infile', 'in'
-						when 'infiles' then flatten deps
+							f = first deps
-						when 'outfile' then first @outs
+							f and f.name
-						when 'outfiles' then flatten @outs
+						when 'infiles'
-						when 'name' then @name
+							foreach deps, => @name
-						else error "No such field in TargetDepsContext: #{k}"
+						when 'outfile', 'out'
+							f = first @outs
+							f and f.name
+						when 'outfiles'
+							foreach @outs, => @name
+						when 'name'
+							@name
+						else
+							error "No such field in TargetDepsContext: #{k}"
 				__newindex: (k) =>
 					error "Attempt to set field #{k} of TargetDepsContext"
 			for depfn in *target.depfunctions
-				deps = flatten deps, foreach depfn, (fn) -> resolve runwithcontext fn, @dag.env, ctx
+				deps = flatten deps, foreach (runwithcontext depfn, @dag.env, ctx), resolve
 		@ins = foreach deps, (dep) -> dep.name
 		@after = foreach after, (dep) -> dep.name
 		@deps = flatten { deps, after }
 		@built = true if #@deps == 0 and #@buildfunctions == 0
 
+	children: =>
+		[k for k, n in pairs @dag.nodes when (includes n.ins, @name) or (includes n.after, @name)]
+
 	canbuild: =>
 		for node in *flatten { @ins, @after }
 			if not @dag.nodes[node].built
 				return false
 		for file in *@ins
 			if not exists file
-				error "Node #{name} has ran all of its parents, but can't run since #{file} doesn't exist"
+				error "Node #{@name} has ran all of its parents, but can't run since #{file} doesn't exist. Did you mean to use after instead of depends?"
 		return true
 
 	build: (opts={}) =>
 		force = opts.force or false
 		quiet = opts.quiet or false
 
-		return if @built
+		return false if @built or #@buildfunctions == 0
-		return unless force or @shouldbuild!
+		return false unless force or @shouldbuild!
-		print "#{@type == 'virtual' and "Running" or "Building"} #{@name}" unless quiet or #@buildfunctions == 0
+		print "#{@type == 'virtual' and "Running" or "Building"} #{@name} [level #{@level}]" unless quiet
 		@actuallybuild!
+		true
 
 
 	shouldbuild: =>
@@ -149,9 +204,9 @@ class DepNode
 		ctx = setmetatable {},
 			__index: (_, k) ->
 				switch k
-					when 'infile' then @ins[1]
+					when 'infile', 'in' then @ins[1]
 					when 'infiles' then @ins
-					when 'outfile' then @outs[1]
+					when 'outfile', 'out' then @outs[1]
 					when 'outfiles' then @outs
 					when 'name' then @name
 					else error "No such field in TargetContext: #{k}"

moonbuild/core/Pipeline.moon

@@ -0,0 +1,56 @@
+Target = require 'moonbuild.core.Target'
+_ = require 'moonbuild._'
+import flatten, patsubst from _
+
+class Pipeline
+	new: (@ctx) =>
+		@lastsources = {}
+
+	sources: (...) =>
+		@lastsources = flatten @lastsources, ...
+	source: (src) =>
+		@lastsources = flatten @lastsources, src
+
+	step: (name, params) =>
+		public = true
+		public, params = false, name if (type name) == 'table'
+
+		tgttype = if params.pattern
+			error "pattern must be a table with the same format as patsubst" unless (type params.pattern) == 'table' and (type params.pattern[1]) == 'string' and (type params.pattern[2]) == 'string'
+			'pattern'
+		elseif params.output or params.out
+			error "output must be a string" unless (type params.output or params.out) == 'string'
+			'single'
+		else
+			error "invalid step type for pipeline: must be pattern or single (out/output)"
+
+		tgtouts = switch tgttype
+			when 'pattern' then patsubst @lastsources, params.pattern[1], params.pattern[2]
+			when 'single' then params.output or params.out
+
+		tgtpatt = switch tgttype
+			when 'pattern' then params.pattern[2]
+			when 'single' then nil
+
+		tgtins = switch tgttype
+			when 'pattern' then params.pattern[1]
+			when 'single' then @lastsources
+
+		tgtprod = switch tgttype
+			when 'pattern' then params.pattern[2]
+			when 'single' then '%'
+
+		tgt = with Target @ctx, tgtouts, pattern: tgtpatt
+			\depends tgtins
+			\produces tgtprod
+			\fn params.fn or error "pipeline steps need a fn"
+		tgt\mkdirs! if params.mkdirs
+		tgt\sync! if params.sync
+		@ctx\addtarget tgt
+
+		if public
+			@ctx\addtarget with Target @ctx, name
+				\depends tgtouts
+				.public = true
+
+		@lastsources = tgtouts

moonbuild/core/Variable.moon

@@ -4,7 +4,17 @@ class Variable
 
 	new: (@name, ...) =>
 		@public = false
-		if (select '#', ...) !=1 or (type ...) == 'table'
+		if (type @name) == 'table'
+			error "not a valid var table: #{next @name}" unless (type next @name) == 'string'
+			error "more than one var at once: #{next @name}, #{next @name, (next @name)}" if next @name, (next @name)
+			name = next @name
+			@name, param = name, @name
+			val = param[name]
+			if (select '#', ...) !=0 or (type val) == 'table'
+				@value = flatten val, ...
+			else
+				@value = val
+		elseif (select '#', ...) !=1 or (type ...) == 'table'
 			@value = flatten ...
 		else
 			@value = ...

moonbuild/core/executor.moon

@@ -0,0 +1,2 @@
+ok, MultiProcessExecutor = pcall -> require 'moonbuild.core.multiprocessexecutor'
+ok and MultiProcessExecutor or require 'moonbuild.core.singleprocessexecutor'

moonbuild/core/multiprocessexecutor.moon

@@ -1,3 +1,4 @@
+SingleProcessExecutor = require 'moonbuild.core.singleprocessexecutor'
 import fork, _exit from require 'posix.unistd'
 import wait from require 'posix.sys.wait'
 import open, stderr from io
@@ -17,8 +18,12 @@ class Executor
 		@processes = {}
 		@nprocesses = 0
 		@building = {}
+		@nbuilt = 0
 
 	execute: (opts) =>
+		if @nparallel == 1
+			return (SingleProcessExecutor @dag, 1)\execute opts
+
 		block = @dag\buildablenodes!
 		while #block != 0
 			for node in *block
@@ -36,7 +41,21 @@ class Executor
 		for name, node in pairs @dag.nodes
 			error "Node #{name} wasn't built" unless node.built
 
+		unless opts.quiet
+			if @nbuilt == 0
+				print "Nothing to be done"
+			else
+				print "Built #{@nbuilt} targets"
+
 	addprocess: (node, opts) =>
+		if node.sync
+			while @nprocesses != 0
+				@waitprocess!
+			node\build opts
+			node.built = true
+			node\updatecache!
+			return
+
 		pid = fork!
 		error "Failed to fork" unless pid
 		if pid!=0
@@ -44,18 +63,20 @@ class Executor
 			@nprocesses += 1
 			@building[node] = true
 		else
-			ok, err = pcall -> node\build opts
+			ok, status = pcall -> node\build opts
 			if ok
+				_exit status and 0 or 2
 				_exit 0
 			else
-				stderr\write err
+				stderr\write status
 				_exit 1
 
 	waitprocess: =>
 		pid, ty, status = wait!
 		error "Failed to wait" unless pid
-		error "Failed to build #{@processes[pid].name}" if ty != 'exited' or status != 0
+		error "Failed to build #{@processes[pid].name}" if ty != 'exited' or status != 0 and status != 2
 		@processes[pid].built = true
 		@processes[pid]\updatecache!
 		@processes[pid] = nil
 		@nprocesses -= 1
+		@nbuilt += 1 if status == 0

moonbuild/core/singleprocessexecutor.moon

@@ -4,13 +4,21 @@ class Executor
 	new: (@dag, @nparallel) =>
 
 	execute: (opts) =>
+		nbuilt = 0
+
 		block = @dag\buildablenodes!
 		while #block != 0
 			for node in *block
-				node\build opts
+				nbuilt +=1 if node\build opts
 				node\updatecache!
 				node.built = true
 			block = @dag\buildablenodes!
 
 		for name, node in pairs @dag.nodes
 			error "Node #{name} wasn't built" unless node.built
+
+		unless opts.quiet
+			if nbuilt == 0
+				print "Nothing to be done"
+			else
+				print "Built #{nbuilt} targets"

moonbuild/env/init.moon

@@ -1,5 +1,6 @@
 Target = require 'moonbuild.core.Target'
 Variable = require 'moonbuild.core.Variable'
+Pipeline = require 'moonbuild.core.Pipeline'
 _ = require 'moonbuild._'
 import flatten from _
 
@@ -18,10 +19,10 @@ import flatten from _
 	rawset env, '_G', env
 	rawset env, '_ENV', env
 
-	rawset env, 'var', (name, ...) ->
+	rawset env, 'var', (...) ->
-		var = Variable name, ...
+		var = Variable ...
 		ctx\addvar var
-		rawset varlayer, name, var.value
+		rawset varlayer, var.name, var.value
 		var
 
 	rawset env, 'target', (name, opts) ->
@@ -29,4 +30,7 @@ import flatten from _
 		ctx\addtarget target
 		target
 
+	rawset env, 'pipeline', ->
+		Pipeline ctx
+
 	env, varlayer

moonbuild/init.moon

@@ -0,0 +1,60 @@
+import loadfile from require 'moonscript.base'
+Context = require 'moonbuild.context'
+DepGraph = require 'moonbuild.core.DAG'
+Executor = require 'moonbuild.core.executor'
+_ = require 'moonbuild._'
+import insert from table
+
+moonbuild = (...) ->
+	-- build argument table
+	opts = {}
+	for i=1, select '#', ...
+		arg = select i, ...
+		if (type arg) == 'string'
+			insert opts, arg
+		elseif (type arg) == 'table'
+			for k, v in pairs arg
+				opts[k] = v if (type k) != 'number'
+			for i, v in ipairs arg
+				insert opts, v
+		else
+			error "Invalid argument type #{type arg} for moonbuild"
+
+	-- resolve arguments
+	buildfile = opts.buildfile or opts.b or 'Build.moon'
+	opts.buildfile = buildfile
+	parallel = opts.parallel or opts.j or 1
+	parallel = true if parallel == 'y'
+	opts.parallel = parallel
+	quiet = opts.quiet or opts.q or false
+	opts.quiet = quiet
+	force = opts.force or opts.f or false
+	opts.force = force
+	verbose = opts.verbose or opts.v or false
+	opts.verbose = verbose
+
+	-- create context and DAG
+	ctx = Context!
+	ctx\load (loadfile buildfile), opts
+	print "Loaded buildfile" if verbose
+	ctx\init!
+	print "Initialized buildfile" if verbose
+	targets = #opts==0 and ctx.defaulttargets or opts
+	dag = DepGraph ctx, targets
+	print "Created dependancy graph" if verbose
+
+	-- and build
+	nparallel = parallel == true and Executor\getmaxparallel! or parallel
+	print "Building with #{nparallel} max parallel process#{nparallel>1 and "es" or ""}" if verbose
+	executor = Executor dag, nparallel
+	executor\execute opts
+	print "Finished" if verbose
+
+table = {
+	:moonbuild, :_
+	:Context, :DepGraph, :Executor
+}
+
+setmetatable table,
+	__call: (...) => moonbuild ...
+	__index: (name) => require "moonbuild.#{name}"

out/moonbuild.lua

@@ -1,6 +1,3 @@
-#!/usr/bin/env lua5.3
-do
-
 do
 local _ENV = _ENV
 package.preload[ "moonbuild._" ] = function( ... ) local arg = _G.arg;
@@ -70,11 +67,21 @@ end
 cmd.backend = backend
 cmd.parseargs = parseargs
 cmd.escape = escape
+local _cmd = cmd.cmd
+local _cmdrst = cmd.cmdrst
+cmd.cmdline = function(cmdline)
+  return _cmd(parseargs(cmdline))
+end
+cmd.cmdlinerst = function(cmdline)
+  return _cmdrst(parseargs(cmdline))
+end
 return setmetatable(cmd, {
   __call = function(self)
     return {
       'cmd',
       'cmdrst',
+      'cmdline',
+      'cmdlinerst',
       'sh'
     }
   end
@@ -636,6 +643,7 @@ common.includes = includes
 common.patget = patget
 common.patset = patset
 common.patsubst = patsubst
+common.exclude = exclude
 common.min = min
 common.max = max
 common.minmax = minmax
@@ -963,14 +971,27 @@ mkdir = function(dir)
 end
 local mkdirs
 mkdirs = function(dir)
-  if isdir(dir) then
+  do
-    return 
+    local attr = attributes(normalizepath(dir))
-  end
+    if attr then
-  if exists(dir) then
+      if attr.mode == 'directory' then
-    error("Can't mkdirs " .. tostring(dir) .. ": file exists")
+        return 
+      end
+      error("Can't mkdirs " .. tostring(dir) .. ": file exists")
+    end
   end
   mkdirs(parent(dir))
-  return mkdir(dir)
+  if not (pcall(function()
+    return actualmkdir(dir)
+  end)) then
+    clearentry(parent(dir))
+    clearentry(dir)
+    if not (isdir(dir)) then
+      error("Failed to mkdirs " .. tostring(dir) .. ": last mkdir failed")
+    end
+  end
+  clearentry(parent(dir))
+  return clearentry(dir)
 end
 do
   local _tbl_0 = { }
@@ -1272,11 +1293,11 @@ _cdeps = function(cc, cflags, path)
 end
 local cdeps = setmetatable({ }, {
   __index = function(self, cc)
-    return function(cflags, path)
+    return function(path, cflags)
       return _cdeps(cc, cflags, path)
     end
   end,
-  __call = function(self, cflags, path)
+  __call = function(self, path, cflags)
     return _cdeps('cc', cflags, path)
   end
 })
@@ -1646,10 +1667,10 @@ end
 do
 local _ENV = _ENV
 package.preload[ "moonbuild.core.DAG" ] = function( ... ) local arg = _G.arg;
-local filter, foreach, flatten, patsubst
+local first, filter, foreach, flatten, patsubst, includes
 do
   local _obj_0 = require('moonbuild._common')
-  filter, foreach, flatten, patsubst = _obj_0.filter, _obj_0.foreach, _obj_0.flatten, _obj_0.patsubst
+  first, filter, foreach, flatten, patsubst, includes = _obj_0.first, _obj_0.filter, _obj_0.foreach, _obj_0.flatten, _obj_0.patsubst, _obj_0.includes
 end
 local runwithcontext
 runwithcontext = require('moonbuild.compat.ctx').runwithcontext
@@ -1659,8 +1680,11 @@ do
   local _obj_0 = require('moonbuild._fs')
   exists, parent, mkdirs, clearentry, disableentry, attributes = _obj_0.exists, _obj_0.parent, _obj_0.mkdirs, _obj_0.clearentry, _obj_0.disableentry, _obj_0.attributes
 end
-local sort
+local sort, insert, remove
-sort = table.sort
+do
+  local _obj_0 = table
+  sort, insert, remove = _obj_0.sort, _obj_0.insert, _obj_0.remove
+end
 local huge
 huge = math.huge
 local DepNode, FileTarget
@@ -1670,6 +1694,8 @@ nodepriority = function(a, b)
   local tb = type(b.name)
   local da = #a.deps
   local db = #b.deps
+  local sa = a.sync
+  local sb = b.sync
   if ta == 'string' and tb ~= 'string' then
     return true
   elseif ta ~= 'string' and tb == 'string' then
@@ -1678,6 +1704,10 @@ nodepriority = function(a, b)
     return true
   elseif a.priority < b.priority then
     return false
+  elseif sa and not sb then
+    return false
+  elseif sb and not sa then
+    return true
   else
     return da < db
   end
@@ -1689,6 +1719,9 @@ transclosure = function(obj, prop)
   local set = { }
   local imp
   imp = function(e)
+    if not (e[prop]) then
+      return 
+    end
     local _list_0 = e[prop]
     for _index_0 = 1, #_list_0 do
       local v = _list_0[_index_0]
@@ -1715,7 +1748,7 @@ do
       if self.nodes[name] then
         return 
       end
-      local elected = self:resolvedeps(name)
+      local elected = self:topresolvedeps(name)
       self.nodes[name] = elected
       local _list_0 = (transclosure(elected, 'deps'))
       for _index_0 = 1, #_list_0 do
@@ -1725,10 +1758,42 @@ do
       end
       elected.deps = nil
     end,
-    resolvedeps = function(self, name)
+    topresolvedeps = function(self, name)
+      local errors = { }
+      local ok, rst = pcall(function()
+        return self:resolvedeps(name, nil, errors)
+      end)
+      if ok then
+        return rst
+      else
+        local msg = {
+          "Failed to resolve target \'" .. tostring(name) .. "\'\n"
+        }
+        for _index_0 = 1, #errors do
+          local e = errors[_index_0]
+          if e.err:match('^moonbuild') then
+            e.err = e.err:match(': (.+)$')
+          end
+        end
+        for i = #errors, 1, -1 do
+          local e = errors[i]
+          insert(msg, tostring(string.rep('| ', e.level - 1)) .. "+-[" .. tostring(e.name) .. "] level " .. tostring(e.level) .. ": " .. tostring(e.err))
+        end
+        insert(msg, '')
+        return error(table.concat(msg, '\n'))
+      end
+    end,
+    resolvedeps = function(self, name, level, errors)
+      if level == nil then
+        level = 1
+      end
+      if errors == nil then
+        errors = { }
+      end
       do
         local node = self.nodes[name]
         if node then
+          print("deps(" .. tostring(name) .. ") = " .. tostring(node.name or '[noname]'))
           return node, { }
         end
       end
@@ -1742,7 +1807,7 @@ do
         return {
           a = {
             pcall(function()
-              return DepNode(self, candidate, name)
+              return DepNode(self, candidate, name, level, errors)
             end)
           }
         }
@@ -1753,7 +1818,16 @@ do
         return node.a[2]
       end)
       sort(resolved, nodepriority)
-      return resolved[1] or error("Cannot resolve target " .. tostring(name))
+      if not (resolved[1]) then
+        local err = "Cannot resolve target " .. tostring(name) .. ": " .. tostring(#candidates) .. " candidates, " .. tostring(#resolved) .. " resolved"
+        table.insert(errors, {
+          name = name,
+          level = level,
+          err = err
+        })
+        error(err)
+      end
+      return resolved[1]
     end,
     buildablenodes = function(self)
       local _accum_0 = { }
@@ -1765,6 +1839,47 @@ do
         end
       end
       return _accum_0
+    end,
+    reset = function(self)
+      for k, n in pairs(self.nodes) do
+        n.built = false
+      end
+    end,
+    resetchildren = function(self, names)
+      local done = { }
+      local stack
+      do
+        local _accum_0 = { }
+        local _len_0 = 1
+        for _index_0 = 1, #names do
+          local v = names[_index_0]
+          _accum_0[_len_0] = v
+          _len_0 = _len_0 + 1
+        end
+        stack = _accum_0
+      end
+      while #stack ~= 0 do
+        local _continue_0 = false
+        repeat
+          local name = remove(stack)
+          if done[name] then
+            _continue_0 = true
+            break
+          end
+          done[name] = true
+          local node = self.nodes[name]
+          node.built = false
+          local _list_0 = (node:children())
+          for _index_0 = 1, #_list_0 do
+            local n = _list_0[_index_0]
+            insert(stack, n)
+          end
+          _continue_0 = true
+        until true
+        if not _continue_0 then
+          break
+        end
+      end
     end
   }
   _base_0.__index = _base_0
@@ -1797,6 +1912,17 @@ end
 do
   local _class_0
   local _base_0 = {
+    children = function(self)
+      local _accum_0 = { }
+      local _len_0 = 1
+      for k, n in pairs(self.dag.nodes) do
+        if (includes(n.ins, self.name)) or (includes(n.after, self.name)) then
+          _accum_0[_len_0] = k
+          _len_0 = _len_0 + 1
+        end
+      end
+      return _accum_0
+    end,
     canbuild = function(self)
       local _list_0 = flatten({
         self.ins,
@@ -1812,7 +1938,7 @@ do
       for _index_0 = 1, #_list_1 do
         local file = _list_1[_index_0]
         if not exists(file) then
-          error("Node " .. tostring(name) .. " has ran all of its parents, but can't run since " .. tostring(file) .. " doesn't exist")
+          error("Node " .. tostring(self.name) .. " has ran all of its parents, but can't run since " .. tostring(file) .. " doesn't exist. Did you mean to use after instead of depends?")
         end
       end
       return true
@@ -1823,16 +1949,17 @@ do
       end
       local force = opts.force or false
       local quiet = opts.quiet or false
-      if self.built then
+      if self.built or #self.buildfunctions == 0 then
-        return 
+        return false
       end
       if not (force or self:shouldbuild()) then
-        return 
+        return false
       end
-      if not (quiet or #self.buildfunctions == 0) then
+      if not (quiet) then
-        print(tostring(self.type == 'virtual' and "Running" or "Building") .. " " .. tostring(self.name))
+        print(tostring(self.type == 'virtual' and "Running" or "Building") .. " " .. tostring(self.name) .. " [level " .. tostring(self.level) .. "]")
       end
-      return self:actuallybuild()
+      self:actuallybuild()
+      return true
     end,
     shouldbuild = function(self)
       if #self.outs == 0 or #self.ins == 0 or self.type == 'virtual' then
@@ -1877,11 +2004,11 @@ do
       local ctx = setmetatable({ }, {
         __index = function(_, k)
           local _exp_0 = k
-          if 'infile' == _exp_0 then
+          if 'infile' == _exp_0 or 'in' == _exp_0 then
             return self.ins[1]
           elseif 'infiles' == _exp_0 then
             return self.ins
-          elseif 'outfile' == _exp_0 then
+          elseif 'outfile' == _exp_0 or 'out' == _exp_0 then
             return self.outs[1]
           elseif 'outfiles' == _exp_0 then
             return self.outs
@@ -1911,8 +2038,8 @@ do
   }
   _base_0.__index = _base_0
   _class_0 = setmetatable({
-    __init = function(self, dag, target, name)
+    __init = function(self, dag, target, name, level, errors)
-      self.dag, self.name = dag, name
+      self.dag, self.name, self.level = dag, name, level
       self.priority = target.priority
       self.buildfunctions = target.buildfunctions
       self.mkdirs = target._mkdirs
@@ -1927,7 +2054,7 @@ do
       self.built = false
       local resolve
       resolve = function(name)
-        return self.dag:resolvedeps(patsubst(self.name, target.pattern, name))
+        return self.dag:resolvedeps((patsubst(self.name, target.pattern, name)), level + 1, errors)
       end
       local after = flatten(foreach(target.needtargets, resolve))
       local deps = flatten(foreach(target.infiles, resolve))
@@ -1935,14 +2062,20 @@ do
         local ctx = setmetatable({ }, {
           __index = function(_, k)
             local _exp_0 = k
-            if 'infile' == _exp_0 then
+            if 'infile' == _exp_0 or 'in' == _exp_0 then
-              return first(deps)
+              local f = first(deps)
+              return f and f.name
             elseif 'infiles' == _exp_0 then
-              return flatten(deps)
+              return foreach(deps, function(self)
-            elseif 'outfile' == _exp_0 then
+                return self.name
-              return first(self.outs)
+              end)
+            elseif 'outfile' == _exp_0 or 'out' == _exp_0 then
+              local f = first(self.outs)
+              return f and f.name
             elseif 'outfiles' == _exp_0 then
-              return flatten(self.outs)
+              return foreach(self.outs, function(self)
+                return self.name
+              end)
             elseif 'name' == _exp_0 then
               return self.name
             else
@@ -1956,9 +2089,7 @@ do
         local _list_0 = target.depfunctions
         for _index_0 = 1, #_list_0 do
           local depfn = _list_0[_index_0]
-          deps = flatten(deps, foreach(depfn, function(fn)
+          deps = flatten(deps, foreach((runwithcontext(depfn, self.dag.env, ctx)), resolve))
-            return resolve(runwithcontext(fn, self.dag.env, ctx))
-          end))
         end
       end
       self.ins = foreach(deps, function(dep)
@@ -2028,6 +2159,123 @@ return DepGraph
 end
 end
 
+do
+local _ENV = _ENV
+package.preload[ "moonbuild.core.Pipeline" ] = function( ... ) local arg = _G.arg;
+local Target = require('moonbuild.core.Target')
+local _ = require('moonbuild._')
+local flatten, patsubst
+flatten, patsubst = _.flatten, _.patsubst
+local Pipeline
+do
+  local _class_0
+  local _base_0 = {
+    sources = function(self, ...)
+      self.lastsources = flatten(self.lastsources, ...)
+    end,
+    source = function(self, src)
+      self.lastsources = flatten(self.lastsources, src)
+    end,
+    step = function(self, name, params)
+      local public = true
+      if (type(name)) == 'table' then
+        public, params = false, name
+      end
+      local tgttype
+      if params.pattern then
+        if not ((type(params.pattern)) == 'table' and (type(params.pattern[1])) == 'string' and (type(params.pattern[2])) == 'string') then
+          error("pattern must be a table with the same format as patsubst")
+        end
+        tgttype = 'pattern'
+      elseif params.output or params.out then
+        if not ((type(params.output or params.out)) == 'string') then
+          error("output must be a string")
+        end
+        tgttype = 'single'
+      else
+        tgttype = error("invalid step type for pipeline: must be pattern or single (out/output)")
+      end
+      local tgtouts
+      local _exp_0 = tgttype
+      if 'pattern' == _exp_0 then
+        tgtouts = patsubst(self.lastsources, params.pattern[1], params.pattern[2])
+      elseif 'single' == _exp_0 then
+        tgtouts = params.output or params.out
+      end
+      local tgtpatt
+      local _exp_1 = tgttype
+      if 'pattern' == _exp_1 then
+        tgtpatt = params.pattern[2]
+      elseif 'single' == _exp_1 then
+        tgtpatt = nil
+      end
+      local tgtins
+      local _exp_2 = tgttype
+      if 'pattern' == _exp_2 then
+        tgtins = params.pattern[1]
+      elseif 'single' == _exp_2 then
+        tgtins = self.lastsources
+      end
+      local tgtprod
+      local _exp_3 = tgttype
+      if 'pattern' == _exp_3 then
+        tgtprod = params.pattern[2]
+      elseif 'single' == _exp_3 then
+        tgtprod = '%'
+      end
+      local tgt
+      do
+        local _with_0 = Target(self.ctx, tgtouts, {
+          pattern = tgtpatt
+        })
+        _with_0:depends(tgtins)
+        _with_0:produces(tgtprod)
+        _with_0:fn(params.fn or error("pipeline steps need a fn"))
+        tgt = _with_0
+      end
+      if params.mkdirs then
+        tgt:mkdirs()
+      end
+      if params.sync then
+        tgt:sync()
+      end
+      self.ctx:addtarget(tgt)
+      if public then
+        self.ctx:addtarget((function()
+          do
+            local _with_0 = Target(self.ctx, name)
+            _with_0:depends(tgtouts)
+            _with_0.public = true
+            return _with_0
+          end
+        end)())
+      end
+      self.lastsources = tgtouts
+    end
+  }
+  _base_0.__index = _base_0
+  _class_0 = setmetatable({
+    __init = function(self, ctx)
+      self.ctx = ctx
+      self.lastsources = { }
+    end,
+    __base = _base_0,
+    __name = "Pipeline"
+  }, {
+    __index = _base_0,
+    __call = function(cls, ...)
+      local _self_0 = setmetatable({}, _base_0)
+      cls.__init(_self_0, ...)
+      return _self_0
+    end
+  })
+  _base_0.__class = _class_0
+  Pipeline = _class_0
+  return _class_0
+end
+end
+end
+
 do
 local _ENV = _ENV
 package.preload[ "moonbuild.core.Target" ] = function( ... ) local arg = _G.arg;
@@ -2148,7 +2396,23 @@ do
     __init = function(self, name, ...)
       self.name = name
       self.public = false
-      if (select('#', ...)) ~= 1 or (type(...)) == 'table' then
+      if (type(self.name)) == 'table' then
+        if not ((type(next(self.name))) == 'string') then
+          error("not a valid var table: " .. tostring(next(self.name)))
+        end
+        if next(self.name, (next(self.name))) then
+          error("more than one var at once: " .. tostring(next(self.name)) .. ", " .. tostring(next(self.name, (next(self.name)))))
+        end
+        name = next(self.name)
+        local param
+        self.name, param = name, self.name
+        local val = param[name]
+        if (select('#', ...)) ~= 0 or (type(val)) == 'table' then
+          self.value = flatten(val, ...)
+        else
+          self.value = val
+        end
+      elseif (select('#', ...)) ~= 1 or (type(...)) == 'table' then
         self.value = flatten(...)
       else
         self.value = ...
@@ -2173,9 +2437,20 @@ end
 end
 end
 
+do
+local _ENV = _ENV
+package.preload[ "moonbuild.core.executor" ] = function( ... ) local arg = _G.arg;
+local ok, MultiProcessExecutor = pcall(function()
+  return require('moonbuild.core.multiprocessexecutor')
+end)
+return ok and MultiProcessExecutor or require('moonbuild.core.singleprocessexecutor')
+end
+end
+
 do
 local _ENV = _ENV
 package.preload[ "moonbuild.core.multiprocessexecutor" ] = function( ... ) local arg = _G.arg;
+local SingleProcessExecutor = require('moonbuild.core.singleprocessexecutor')
 local fork, _exit
 do
   local _obj_0 = require('posix.unistd')
@@ -2195,6 +2470,9 @@ do
   local _class_0
   local _base_0 = {
     execute = function(self, opts)
+      if self.nparallel == 1 then
+        return (SingleProcessExecutor(self.dag, 1)):execute(opts)
+      end
       local block = self.dag:buildablenodes()
       while #block ~= 0 do
         for _index_0 = 1, #block do
@@ -2242,8 +2520,24 @@ do
           error("Node " .. tostring(name) .. " wasn't built")
         end
       end
+      if not (opts.quiet) then
+        if self.nbuilt == 0 then
+          return print("Nothing to be done")
+        else
+          return print("Built " .. tostring(self.nbuilt) .. " targets")
+        end
+      end
     end,
     addprocess = function(self, node, opts)
+      if node.sync then
+        while self.nprocesses ~= 0 do
+          self:waitprocess()
+        end
+        node:build(opts)
+        node.built = true
+        node:updatecache()
+        return 
+      end
       local pid = fork()
       if not (pid) then
         error("Failed to fork")
@@ -2253,13 +2547,14 @@ do
         self.nprocesses = self.nprocesses + 1
         self.building[node] = true
       else
-        local ok, err = pcall(function()
+        local ok, status = pcall(function()
           return node:build(opts)
         end)
         if ok then
+          _exit(status and 0 or 2)
           return _exit(0)
         else
-          stderr:write(err)
+          stderr:write(status)
           return _exit(1)
         end
       end
@@ -2269,13 +2564,16 @@ do
       if not (pid) then
         error("Failed to wait")
       end
-      if ty ~= 'exited' or status ~= 0 then
+      if ty ~= 'exited' or status ~= 0 and status ~= 2 then
         error("Failed to build " .. tostring(self.processes[pid].name))
       end
       self.processes[pid].built = true
       self.processes[pid]:updatecache()
       self.processes[pid] = nil
       self.nprocesses = self.nprocesses - 1
+      if status == 0 then
+        self.nbuilt = self.nbuilt + 1
+      end
     end
   }
   _base_0.__index = _base_0
@@ -2285,6 +2583,7 @@ do
       self.processes = { }
       self.nprocesses = 0
       self.building = { }
+      self.nbuilt = 0
     end,
     __base = _base_0,
     __name = "Executor"
@@ -2326,11 +2625,14 @@ do
   local _class_0
   local _base_0 = {
     execute = function(self, opts)
+      local nbuilt = 0
       local block = self.dag:buildablenodes()
       while #block ~= 0 do
         for _index_0 = 1, #block do
           local node = block[_index_0]
-          node:build(opts)
+          if node:build(opts) then
+            nbuilt = nbuilt + 1
+          end
           node:updatecache()
           node.built = true
         end
@@ -2341,6 +2643,13 @@ do
           error("Node " .. tostring(name) .. " wasn't built")
         end
       end
+      if not (opts.quiet) then
+        if nbuilt == 0 then
+          return print("Nothing to be done")
+        else
+          return print("Built " .. tostring(nbuilt) .. " targets")
+        end
+      end
     end
   }
   _base_0.__index = _base_0
@@ -2399,6 +2708,7 @@ local _ENV = _ENV
 package.preload[ "moonbuild.env.init" ] = function( ... ) local arg = _G.arg;
 local Target = require('moonbuild.core.Target')
 local Variable = require('moonbuild.core.Variable')
+local Pipeline = require('moonbuild.core.Pipeline')
 local _ = require('moonbuild._')
 local flatten
 flatten = _.flatten
@@ -2418,10 +2728,10 @@ return function(ctx)
   rawset(env, '_', _)
   rawset(env, '_G', env)
   rawset(env, '_ENV', env)
-  rawset(env, 'var', function(name, ...)
+  rawset(env, 'var', function(...)
-    local var = Variable(name, ...)
+    local var = Variable(...)
     ctx:addvar(var)
-    rawset(varlayer, name, var.value)
+    rawset(varlayer, var.name, var.value)
     return var
   end)
   rawset(env, 'target', function(name, opts)
@@ -2429,6 +2739,9 @@ return function(ctx)
     ctx:addtarget(target)
     return target
   end)
+  rawset(env, 'pipeline', function()
+    return Pipeline(ctx)
+  end)
   return env, varlayer
 end
 end
@@ -2476,47 +2789,83 @@ end
 end
 end
 
-end
-
 local loadfile
 loadfile = require('moonscript.base').loadfile
 local Context = require('moonbuild.context')
-local Variable = require('moonbuild.core.Variable')
 local DepGraph = require('moonbuild.core.DAG')
-local sort, concat
+local Executor = require('moonbuild.core.executor')
-do
+local _ = require('moonbuild._')
-  local _obj_0 = table
+local insert
-  sort, concat = _obj_0.sort, _obj_0.concat
+insert = table.insert
-end
+local moonbuild
-return {
+moonbuild = function(...)
-  tasks = {
+  local opts = { }
-    moonbuild = function(self)
+  for i = 1, select('#', ...) do
-      local args = {
+    local arg = select(i, ...)
-        nparallel = self.parallel or self.j,
+    if (type(arg)) == 'string' then
-        quiet = self.quiet or self.q,
+      insert(opts, arg)
-        buildfile = self.buildfile or self.b,
+    elseif (type(arg)) == 'table' then
-        force = self.force or self.f
+      for k, v in pairs(arg) do
-      }
+        if (type(k)) ~= 'number' then
-      local ctx = Context()
+          opts[k] = v
-      ctx:load((loadfile(args.buildfile or 'Build.moon')), self)
-      ctx:init()
-      local dag = DepGraph(ctx, #self == 0 and ctx.defaulttargets or self)
-      local executor
-      do
-        local Executor
-        do
-          local ok
-          ok, Executor = pcall(function()
-            return require('moonbuild.core.multiprocessexecutor')
-          end)
-          Executor = ok and Executor or require('moonbuild.core.singleprocessexecutor')
         end
-        if args.nparallel == true then
-          args.nparallel = Executor:getmaxparallel()
-        end
-        executor = Executor(dag, args.nparallel)
       end
-      return executor:execute(args)
+      for i, v in ipairs(arg) do
+        insert(opts, v)
+      end
+    else
+      error("Invalid argument type " .. tostring(type(arg)) .. " for moonbuild")
     end
-  }
+  end
-}
+  local buildfile = opts.buildfile or opts.b or 'Build.moon'
+  opts.buildfile = buildfile
+  local parallel = opts.parallel or opts.j or 1
+  if parallel == 'y' then
+    parallel = true
+  end
+  opts.parallel = parallel
+  local quiet = opts.quiet or opts.q or false
+  opts.quiet = quiet
+  local force = opts.force or opts.f or false
+  opts.force = force
+  local verbose = opts.verbose or opts.v or false
+  opts.verbose = verbose
+  local ctx = Context()
+  ctx:load((loadfile(buildfile)), opts)
+  if verbose then
+    print("Loaded buildfile")
+  end
+  ctx:init()
+  if verbose then
+    print("Initialized buildfile")
+  end
+  local targets = #opts == 0 and ctx.defaulttargets or opts
+  local dag = DepGraph(ctx, targets)
+  if verbose then
+    print("Created dependancy graph")
+  end
+  local nparallel = parallel == true and Executor:getmaxparallel() or parallel
+  if verbose then
+    print("Building with " .. tostring(nparallel) .. " max parallel process" .. tostring(nparallel > 1 and "es" or ""))
+  end
+  local executor = Executor(dag, nparallel)
+  executor:execute(opts)
+  if verbose then
+    return print("Finished")
+  end
+end
+local table = {
+  moonbuild = moonbuild,
+  _ = _,
+  Context = Context,
+  DepGraph = DepGraph,
+  Executor = Executor
+}
+return setmetatable(table, {
+  __call = function(self, ...)
+    return moonbuild(...)
+  end,
+  __index = function(self, name)
+    return require("moonbuild." .. tostring(name))
+  end
+})

rock.yml

@@ -1,6 +1,6 @@
 package: moonbuild
 source:
-    url: git://github.com/natnat-mc/moonbuild
+    url: git+http://github.com/natnat-mc/moonbuild
 description:
     summary: Small build system in between make and a build.sh
     detailed: >
@@ -22,3 +22,5 @@ build:
     install:
         bin:
             moonbuild: out/moonbuild
+    modules:
+        moonbuild: out/moonbuild.lua

rockspecs/moonbuild-2.1.0-1.rockspec

@@ -0,0 +1,24 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.1.0",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.1.0-1"

rockspecs/moonbuild-2.1.0-2.rockspec

@@ -0,0 +1,24 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.1.0",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.1.0-2"

rockspecs/moonbuild-2.1.0-3.rockspec

@@ -0,0 +1,24 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.1.0",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.1.0-3"

rockspecs/moonbuild-2.1.1-1.rockspec

@@ -0,0 +1,24 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.1.1",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.1.1-1"

rockspecs/moonbuild-2.1.2-1.rockspec

@@ -0,0 +1,24 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.1.2",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.1.2-1"

rockspecs/moonbuild-2.1.2-2.rockspec

@@ -0,0 +1,24 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.1.2",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.1.2-2"

rockspecs/moonbuild-2.1.3-1.rockspec

@@ -0,0 +1,24 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.1.3",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.1.3-1"

rockspecs/moonbuild-2.1.3-2.rockspec

@@ -0,0 +1,24 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.1.3",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.1.3-2"

rockspecs/moonbuild-2.2.0-1.rockspec

@@ -0,0 +1,27 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    },
+    modules = {
+      moonbuild = "out/moonbuild.lua"
+    }
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.2.0",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.2.0-1"

rockspecs/moonbuild-2.2.0-2.rockspec

@@ -0,0 +1,27 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  modules = {
+    moonbuild = "out/moonbuild.lua"
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.2.0",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.2.0-2"

rockspecs/moonbuild-2.2.1-1.rockspec

@@ -0,0 +1,27 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  modules = {
+    moonbuild = "out/moonbuild.lua"
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.2.1",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.2.1-1"

rockspecs/moonbuild-2.2.2-1.rockspec

@@ -0,0 +1,27 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  modules = {
+    moonbuild = "out/moonbuild.lua"
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.2.2",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.2.2-1"

rockspecs/moonbuild-2.2.2-2.rockspec

@@ -0,0 +1,27 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  modules = {
+    moonbuild = "out/moonbuild.lua"
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.2.2",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.2.2-2"

rockspecs/moonbuild-2.3.0-1.rockspec

@@ -0,0 +1,27 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  modules = {
+    moonbuild = "out/moonbuild.lua"
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.3.0",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.3.0-1"

rockspecs/moonbuild-2.3.0-2.rockspec

@@ -0,0 +1,27 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  modules = {
+    moonbuild = "out/moonbuild.lua"
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.3.0",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.3.0-2"

rockspecs/moonbuild-2.4.0-1.rockspec

@@ -0,0 +1,27 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  modules = {
+    moonbuild = "out/moonbuild.lua"
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.4.0",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.4.0-1"

rockspecs/moonbuild-2.5.0-1.rockspec

@@ -0,0 +1,27 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  modules = {
+    moonbuild = "out/moonbuild.lua"
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.5.0",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.5.0-1"

rockspecs/moonbuild-2.5.1-1.rockspec

@@ -0,0 +1,27 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  modules = {
+    moonbuild = "out/moonbuild.lua"
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.5.1",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.5.1-1"

rockspecs/moonbuild-2.6.0-1.rockspec

@@ -0,0 +1,27 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  modules = {
+    moonbuild = "out/moonbuild.lua"
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.6.0",
+  url = "git+http://github.com/natnat-mc/moonbuild"
+}
+version = "2.6.0-1"