Producing rockspec 1.1.3-1

bin/moonbuild.moon

@@ -127,12 +127,11 @@ class BuildObject
 		for i=1, #@outs
 			return true if not otimes[i]
 
-		(max itimes)>=(min otimes)
+		(max itimes)>(min otimes)
 
 error "Need Lua >=5.2" if setfenv
 
-targets = {}
+local targets, defaulttarget
-defaulttarget = 'all'
 
 buildscope =
 	default: (target) ->
@@ -158,14 +157,25 @@ setmetatable buildscope,
 		return global if global
 		(...) -> Command k, ...
 
-file = first {'Build.moon', 'Buildfile.moon', 'Build', 'Buildfile'}, exists
+loadtargets = ->
-error "No Build.moon or Buildfile found" unless file
+	targets = {}
-buildfn = loadwithscope file, buildscope
+	defaulttarget = 'all'
-error "Failed to load build function" unless buildfn
+	file = first {'Build.moon', 'Buildfile.moon', 'Build', 'Buildfile'}, exists
-ok, err = pcall buildfn
+	error "No Build.moon or Buildfile found" unless file
+	buildfn = loadwithscope file, buildscope
+	error "Failed to load build function" unless buildfn
+	buildfn!
+
+buildtargets = ->
+	if #args.targets==0
+		BuildObject\build defaulttarget
+	for target in *args.targets
+		BuildObject\build target
+
+ok, err = pcall loadtargets
 unless ok
 	if err
-		io.stderr\write err, '\n'
+		io.stderr\write "Error while loading build file: ", err, '\n'
 	else
 		io.stderr\write "Unknown error\n"
 	os.exit 1
@@ -197,7 +207,4 @@ if args.deps
 			io.write "\n"
 	os.exit 0
 
-if #args.targets==0
+buildtargets!
-	BuildObject\build defaulttarget
-for target in *args.targets
-	BuildObject\build target

moonbuild.lua

@@ -22,8 +22,8 @@ makecached = function(fn)
   freeze = function(val)
     cache[val] = FROZEN
   end
-  local reset
+  local clear
-  reset = function()
+  clear = function()
     cache = { }
   end
   local get
@@ -44,7 +44,7 @@ makecached = function(fn)
     get = get,
     invalidate = invalidate,
     freeze = freeze,
-    reset = reset
+    clear = clear
   }, {
     __call = function(self, val)
       return get(val)
@@ -53,7 +53,15 @@ makecached = function(fn)
 end
 return {
   attributes = makecached(attributes),
-  dir = makecached(dir)
+  dir = makecached(function(file)
+    local _accum_0 = { }
+    local _len_0 = 1
+    for k in dir(file) do
+      _accum_0[_len_0] = k
+      _len_0 = _len_0 + 1
+    end
+    return _accum_0
+  end)
 }
 
 end
@@ -112,13 +120,19 @@ normalizepath = function(file)
       break
     end
   end
+  if #parts == 0 then
+    return '.'
+  else
     return (absolute and '/' or '') .. concat(parts, '/')
+  end
 end
 local ls
 ls = function(d)
   local _accum_0 = { }
   local _len_0 = 1
-  for f in dir(normalizepath(d)) do
+  local _list_0 = dir(normalizepath(d))
+  for _index_0 = 1, #_list_0 do
+    local f = _list_0[_index_0]
     if f ~= '.' and f ~= '..' then
       _accum_0[_len_0] = f
       _len_0 = _len_0 + 1
@@ -133,7 +147,9 @@ lswithpath = function(d)
   end
   local _accum_0 = { }
   local _len_0 = 1
-  for f in dir(normalizepath(d)) do
+  local _list_0 = dir(normalizepath(d))
+  for _index_0 = 1, #_list_0 do
+    local f = _list_0[_index_0]
     if f ~= '.' and f ~= '..' then
       _accum_0[_len_0] = d .. '/' .. f
       _len_0 = _len_0 + 1
@@ -189,7 +205,7 @@ wildcard = function(glob)
   local absolute = (sub(glob, 1, 1)) == '/'
   for i, part in ipairs(parts) do
     local prevpath = (absolute and '/' or '') .. concat(parts, '/', 1, i - 1)
-    local currpath = prevpath .. '/' .. part
+    local currpath = (i == 1 and '' or (prevpath .. '/')) .. part
     if match(part, '%*%*.*%*%*') then
       error("Two '**' in the same path component in a wildcard")
     end
@@ -264,6 +280,11 @@ invalidatecache = function(file)
   dir.invalidate(parentdir(file))
   return attributes.invalidate(file)
 end
+local clearcache
+clearcache = function()
+  dir.clear()
+  return attributes.clear()
+end
 return {
   wildcard = wildcard,
   exists = exists,
@@ -272,7 +293,8 @@ return {
   normalizepath = normalizepath,
   parentdir = parentdir,
   freezecache = freezecache,
-  invalidatecache = invalidatecache
+  invalidatecache = invalidatecache,
+  clearcache = clearcache
 }
 
 end
@@ -376,7 +398,7 @@ min = function(table, cmp)
   local val = table[1]
   for i = 2, #table do
     local elem = table[i]
-    if cmp(val, elem) then
+    if cmp(elem, val) then
       val = elem
     end
   end
@@ -392,7 +414,7 @@ max = function(table, cmp)
   local val = table[1]
   for i = 2, #table do
     local elem = table[i]
-    if not cmp(val, elem) then
+    if not cmp(elem, val) then
       val = elem
     end
   end
@@ -941,7 +963,7 @@ do
           return true
         end
       end
-      return (max(itimes)) >= (min(otimes))
+      return (max(itimes)) > (min(otimes))
     end
   }
   _base_0.__index = _base_0
@@ -1016,8 +1038,7 @@ end
 if setfenv then
   error("Need Lua >=5.2")
 end
-local targets = { }
+local targets, defaulttarget
-local defaulttarget = 'all'
 local buildscope = {
   default = function(target)
     defaulttarget = target.name
@@ -1055,23 +1076,40 @@ setmetatable(buildscope, {
     end
   end
 })
-local file = first({
+local loadtargets
+loadtargets = function()
+  targets = { }
+  defaulttarget = 'all'
+  local file = first({
     'Build.moon',
     'Buildfile.moon',
     'Build',
     'Buildfile'
-}, exists)
+  }, exists)
-if not (file) then
+  if not (file) then
     error("No Build.moon or Buildfile found")
-end
+  end
-local buildfn = loadwithscope(file, buildscope)
+  local buildfn = loadwithscope(file, buildscope)
-if not (buildfn) then
+  if not (buildfn) then
     error("Failed to load build function")
+  end
+  return buildfn()
 end
-local ok, err = pcall(buildfn)
+local buildtargets
+buildtargets = function()
+  if #args.targets == 0 then
+    BuildObject:build(defaulttarget)
+  end
+  local _list_0 = args.targets
+  for _index_0 = 1, #_list_0 do
+    local target = _list_0[_index_0]
+    BuildObject:build(target)
+  end
+end
+local ok, err = pcall(loadtargets)
 if not (ok) then
   if err then
-    io.stderr:write(err, '\n')
+    io.stderr:write("Error while loading build file: ", err, '\n')
   else
     io.stderr:write("Unknown error\n")
   end
@@ -1112,11 +1150,4 @@ if args.deps then
   end
   os.exit(0)
 end
-if #args.targets == 0 then
+return buildtargets()
-  BuildObject:build(defaulttarget)
-end
-local _list_0 = args.targets
-for _index_0 = 1, #_list_0 do
-  local target = _list_0[_index_0]
-  BuildObject:build(target)
-end

moonbuild/fscache.moon

@@ -12,7 +12,7 @@ makecached = (fn) ->
 	freeze = (val) ->
 		cache[val] = FROZEN
 
-	reset = ->
+	clear = ->
 		cache = {}
 
 	get = (val) ->
@@ -24,10 +24,10 @@ makecached = (fn) ->
 			cache[val] = ret
 		unpack ret
 
-	setmetatable { :get, :invalidate, :freeze, :reset },
+	setmetatable { :get, :invalidate, :freeze, :clear },
 		__call: (val) => get val
 
 {
 	attributes: makecached attributes
-	dir: makecached dir
+	dir: makecached (file) -> [k for k in dir file]
 }

moonbuild/fsutil.moon

@@ -16,15 +16,17 @@ normalizepath = (file) ->
 			remove parts, i-1
 			i -= 2
 			continue
+	if #parts==0
+		'.'
+	else
 		(absolute and '/' or '') .. concat parts, '/'
 
 ls = (d) ->
-	[f for f in dir normalizepath d when f!='.' and f!='..']
+	[f for f in *dir normalizepath d when f!='.' and f!='..']
 
 lswithpath = (d) ->
-	if d==''
+	return ls '.' if d==''
-		return ls '.'
+	[d..'/'..f for f in *dir normalizepath d when f!='.' and f!='..']
-	[d..'/'..f for f in dir normalizepath d when f!='.' and f!='..']
 
 exists = (f) ->
 	(attributes normalizepath f) != nil
@@ -55,7 +57,7 @@ wildcard = (glob) ->
 
 	for i, part in ipairs parts
 		prevpath = (absolute and '/' or '') .. concat parts, '/', 1, i-1
-		currpath = prevpath .. '/' .. part
+		currpath = (i==1 and '' or (prevpath .. '/')) .. part
 
 		if match part, '%*%*.*%*%*'
 			error "Two '**' in the same path component in a wildcard"
@@ -109,10 +111,14 @@ invalidatecache = (file) ->
 	dir.invalidate parentdir file
 	attributes.invalidate file
 
+clearcache = ->
+	dir.clear!
+	attributes.clear!
+
 {
 	:wildcard
 	:exists, :isdir
 	:mtime
 	:normalizepath, :parentdir
-	:freezecache, :invalidatecache
+	:freezecache, :invalidatecache, :clearcache
 }

moonbuild/tableutil.moon

@@ -12,7 +12,7 @@ min = (table, cmp=(a, b) -> a<b) ->
 	val = table[1]
 	for i=2, #table
 		elem = table[i]
-		if cmp val, elem
+		if cmp elem, val
 			val = elem
 	val
 
@@ -20,7 +20,7 @@ max = (table, cmp=(a, b) -> a<b) ->
 	val = table[1]
 	for i=2, #table
 		elem = table[i]
-		if not cmp val, elem
+		if not cmp elem, val
 			val = elem
 	val
 

rockspecs/moonbuild-1.1.1-1.rockspec

@@ -0,0 +1,23 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "moonbuild.lua"
+    }
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.3",
+  "luafilesystem >= 1.7.0"
+}
+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)\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v1.1.1",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "1.1.1-1"

rockspecs/moonbuild-1.1.2-1.rockspec

@@ -0,0 +1,23 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "moonbuild.lua"
+    }
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.3",
+  "luafilesystem >= 1.7.0"
+}
+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)\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v1.1.2",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "1.1.2-1"

rockspecs/moonbuild-1.1.3-1.rockspec

@@ -0,0 +1,23 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "moonbuild.lua"
+    }
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.3",
+  "luafilesystem >= 1.7.0"
+}
+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)\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v1.1.3",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "1.1.3-1"